Updating my fork (#6)

* Show cluster connection URL (microsoft#103)

Add command sfctl cluster show-connection. Command shows the currently connected cluster connection. Nothing is returned is no endpoint is set.

* Add command to see the current version (microsoft#104)

Use `sfctl --version` to see the current sfctl version

* Update README (microsoft#105)

update readme

* Update versions for 6.0.0 release and update get nodes query (microsoft#113)

- Update release notes and versions for 6.0.0 release.
- Add parameter to set max results for query "sfctl node list"

* Add support for python 3.7 and fix linting issues (microsoft#111)

- Add support for python 3.7
- Make fixes where flagged by lint. These fixes are from code from a previous commits, but which were not caught until the latest lint tooling update.

* Removed customSDK in preparation for release (microsoft#114)

Remove the custom SDK folder in preparation for 6.0.0 release. There are no other changes in this PR. Only the deletion of that folder.

* Help text update (microsoft#115)

Add some fixes to the documentation. This includes a typo in the main help text about which version this release (6.0.0) should target.

* Update release notes (microsoft#116)

Update release notes

* Add customSDK (microsoft#120)

* Add upgrade-rollback for compose deployment (microsoft#119)

Add upgrade-rollback command for compose deployment

* Update custom SDK and update API version in paths generation test (microsoft#124)

* update custom SDK to include get cluster version API

* Update paths generation test to reflect updated required API version in get partition list API

* Update knack package to be version 0.4.2 (microsoft#122)

update knack package to be 0.4.2

* Remove retry on failed commands (microsoft#125)

Remove retry for any sfctl failure - no retry on any HTTP request, regardless of returned error code.

.travis.yml

@@ -3,6 +3,15 @@ python:
   - 2.7
   - 3.5
   - 3.6
+
+# The below lines are a workaround to get python 3.7 support to work.
+# Remove when Travis officially supports 3.7
+matrix:
+  include:
+    - python: 3.7
+      dist: xenial
+      sudo: true
+
 git:
   depth: 3
 install:
@@ -18,3 +27,5 @@ after_success:
 branches:
   only:
     - master
+
+

CODEOWNERS

@@ -3,9 +3,9 @@
 
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
-# @samedder and @christina-kang will be requested for
+# @samedder, @christina-kang, and @jeffj6123 will be requested for
 # review when someone opens a pull request.
-*       @samedder @christina-kang
+*       @samedder @christina-kang @jeffj6123
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only
@@ -47,3 +47,6 @@ src/sfctl/custom_container.py @leikong
 # Cluster Upgrade related
 src/sfctl/custom_cluster_upgrade.py @jkochhar
 src/sfctl/helps/cluster_upgrade.py @jkochhar
+
+# Version
+src/sfctl/custom_version.py @jeffj6123

customSDK/servicefabric/models/__init__.py

@@ -76,6 +76,7 @@
 from .cluster_health_chunk_query_description import ClusterHealthChunkQueryDescription
 from .cluster_health_policies import ClusterHealthPolicies
 from .cluster_manifest import ClusterManifest
+from .cluster_version import ClusterVersion
 from .container_api_request_body import ContainerApiRequestBody
 from .container_api_result import ContainerApiResult
 from .container_api_response import ContainerApiResponse
@@ -103,7 +104,6 @@
 from .entity_health_state_chunk import EntityHealthStateChunk
 from .entity_health_state_chunk_list import EntityHealthStateChunkList
 from .epoch import Epoch
-from .backup_epoch import BackupEpoch
 from .event_health_evaluation import EventHealthEvaluation
 from .fabric_event import FabricEvent
 from .fabric_code_version_info import FabricCodeVersionInfo
@@ -317,8 +317,11 @@
 from .failed_property_batch_info import FailedPropertyBatchInfo
 from .backup_schedule_description import BackupScheduleDescription
 from .backup_storage_description import BackupStorageDescription
+from .retention_policy_description import RetentionPolicyDescription
 from .backup_policy_description import BackupPolicyDescription
 from .paged_backup_policy_description_list import PagedBackupPolicyDescriptionList
+from .basic_retention_policy_description import BasicRetentionPolicyDescription
+from .disable_backup_description import DisableBackupDescription
 from .application_backup_configuration_info import ApplicationBackupConfigurationInfo
 from .service_backup_configuration_info import ServiceBackupConfigurationInfo
 from .backup_suspension_info import BackupSuspensionInfo
@@ -376,18 +379,15 @@
 from .process_deactivated_event import ProcessDeactivatedEvent
 from .container_deactivated_event import ContainerDeactivatedEvent
 from .node_aborted_event import NodeAbortedEvent
-from .node_aborting_event import NodeAbortingEvent
 from .node_added_event import NodeAddedEvent
 from .node_close_event import NodeCloseEvent
-from .node_closing_event import NodeClosingEvent
 from .node_deactivate_complete_event import NodeDeactivateCompleteEvent
 from .node_deactivate_start_event import NodeDeactivateStartEvent
 from .node_down_event import NodeDownEvent
 from .node_health_report_created_event import NodeHealthReportCreatedEvent
 from .node_health_report_expired_event import NodeHealthReportExpiredEvent
 from .node_opened_success_event import NodeOpenedSuccessEvent
 from .node_open_failed_event import NodeOpenFailedEvent
-from .node_opening_event import NodeOpeningEvent
 from .node_removed_event import NodeRemovedEvent
 from .node_up_event import NodeUpEvent
 from .partition_health_report_created_event import PartitionHealthReportCreatedEvent
@@ -413,15 +413,66 @@
 from .cluster_upgrade_start_event import ClusterUpgradeStartEvent
 from .chaos_stopped_event import ChaosStoppedEvent
 from .chaos_started_event import ChaosStartedEvent
-from .chaos_restart_node_fault_completed_event import ChaosRestartNodeFaultCompletedEvent
 from .chaos_restart_code_package_fault_scheduled_event import ChaosRestartCodePackageFaultScheduledEvent
-from .chaos_restart_code_package_fault_completed_event import ChaosRestartCodePackageFaultCompletedEvent
 from .chaos_remove_replica_fault_scheduled_event import ChaosRemoveReplicaFaultScheduledEvent
-from .chaos_remove_replica_fault_completed_event import ChaosRemoveReplicaFaultCompletedEvent
 from .chaos_move_secondary_fault_scheduled_event import ChaosMoveSecondaryFaultScheduledEvent
 from .chaos_move_primary_fault_scheduled_event import ChaosMovePrimaryFaultScheduledEvent
 from .chaos_restart_replica_fault_scheduled_event import ChaosRestartReplicaFaultScheduledEvent
 from .chaos_restart_node_fault_scheduled_event import ChaosRestartNodeFaultScheduledEvent
+from .auto_scaling_trigger import AutoScalingTrigger
+from .auto_scaling_mechanism import AutoScalingMechanism
+from .auto_scaling_policy import AutoScalingPolicy
+from .service_resource_description import ServiceResourceDescription
+from .diagnostics_sink_properties import DiagnosticsSinkProperties
+from .diagnostics_description import DiagnosticsDescription
+from .application_resource_description import ApplicationResourceDescription
+from .application_scoped_volume_creation_parameters import ApplicationScopedVolumeCreationParameters
+from .application_scoped_volume_creation_parameters_service_fabric_volume_disk import ApplicationScopedVolumeCreationParametersServiceFabricVolumeDisk
+from .paged_service_resource_description_list import PagedServiceResourceDescriptionList
+from .service_replica_description import ServiceReplicaDescription
+from .paged_service_replica_description_list import PagedServiceReplicaDescriptionList
+from .volume_provider_parameters_azure_file import VolumeProviderParametersAzureFile
+from .volume_resource_description import VolumeResourceDescription
+from .image_registry_credential import ImageRegistryCredential
+from .environment_variable import EnvironmentVariable
+from .setting import Setting
+from .container_label import ContainerLabel
+from .endpoint_properties import EndpointProperties
+from .resource_requests import ResourceRequests
+from .resource_limits import ResourceLimits
+from .resource_requirements import ResourceRequirements
+from .volume_reference import VolumeReference
+from .application_scoped_volume import ApplicationScopedVolume
+from .container_state import ContainerState
+from .container_event import ContainerEvent
+from .container_instance_view import ContainerInstanceView
+from .diagnostics_ref import DiagnosticsRef
+from .reliable_collections_ref import ReliableCollectionsRef
+from .container_code_package_properties import ContainerCodePackageProperties
+from .network_ref import NetworkRef
+from .service_replica_properties import ServiceReplicaProperties
+from .auto_scaling_metric import AutoScalingMetric
+from .average_load_scaling_trigger import AverageLoadScalingTrigger
+from .add_remove_replica_scaling_mechanism import AddRemoveReplicaScalingMechanism
+from .auto_scaling_resource_metric import AutoScalingResourceMetric
+from .secret_resource_properties import SecretResourceProperties
+from .simple_secret_resource_properties import SimpleSecretResourceProperties
+from .secret_value_properties import SecretValueProperties
+from .secret_resource_properties_base import SecretResourcePropertiesBase
+from .secret_resource_description import SecretResourceDescription
+from .paged_secret_resource_description_list import PagedSecretResourceDescriptionList
+from .secret_value_resource_description import SecretValueResourceDescription
+from .paged_secret_value_resource_description_list import PagedSecretValueResourceDescriptionList
+from .gateway_destination import GatewayDestination
+from .tcp_config import TcpConfig
+from .http_route_match_path import HttpRouteMatchPath
+from .http_route_match_header import HttpRouteMatchHeader
+from .http_route_match_rule import HttpRouteMatchRule
+from .http_route_config import HttpRouteConfig
+from .http_host_config import HttpHostConfig
+from .http_config import HttpConfig
+from .gateway_resource_description import GatewayResourceDescription
+from .paged_gateway_resource_description_list import PagedGatewayResourceDescriptionList
 from .service_fabric_client_ap_is_enums import (
     ApplicationDefinitionKind,
     HealthState,
@@ -486,6 +537,7 @@
     PropertyValueKind,
     PropertyBatchOperationKind,
     PropertyBatchInfoKind,
+    RetentionPolicyType,
     BackupStorageKind,
     BackupScheduleKind,
     BackupPolicyScope,
@@ -504,6 +556,18 @@
     RepairTaskHealthCheckState,
     ScalingTriggerKind,
     ScalingMechanismKind,
+    ServiceResourceStatus,
+    ApplicationResourceStatus,
+    ApplicationScopedVolumeKind,
+    SizeTypes,
+    DiagnosticsSinkKind,
+    OperatingSystemTypes,
+    AutoScalingMechanismKind,
+    AutoScalingTriggerKind,
+    AutoScalingMetricKind,
+    SecretKind,
+    HeaderMatchType,
+    GatewayResourceStatus,
     NodeStatusFilter,
     ReplicaHealthReportServiceKind,
     DataLossMode,
@@ -580,6 +644,7 @@
     'ClusterHealthChunkQueryDescription',
     'ClusterHealthPolicies',
     'ClusterManifest',
+    'ClusterVersion',
     'ContainerApiRequestBody',
     'ContainerApiResult',
     'ContainerApiResponse',
@@ -607,7 +672,6 @@
     'EntityHealthStateChunk',
     'EntityHealthStateChunkList',
     'Epoch',
-    'BackupEpoch',
     'EventHealthEvaluation',
     'FabricEvent',
     'FabricCodeVersionInfo',
@@ -821,8 +885,11 @@
     'FailedPropertyBatchInfo',
     'BackupScheduleDescription',
     'BackupStorageDescription',
+    'RetentionPolicyDescription',
     'BackupPolicyDescription',
     'PagedBackupPolicyDescriptionList',
+    'BasicRetentionPolicyDescription',
+    'DisableBackupDescription',
     'ApplicationBackupConfigurationInfo',
     'ServiceBackupConfigurationInfo',
     'BackupSuspensionInfo',
@@ -880,18 +947,15 @@
     'ProcessDeactivatedEvent',
     'ContainerDeactivatedEvent',
     'NodeAbortedEvent',
-    'NodeAbortingEvent',
     'NodeAddedEvent',
     'NodeCloseEvent',
-    'NodeClosingEvent',
     'NodeDeactivateCompleteEvent',
     'NodeDeactivateStartEvent',
     'NodeDownEvent',
     'NodeHealthReportCreatedEvent',
     'NodeHealthReportExpiredEvent',
     'NodeOpenedSuccessEvent',
     'NodeOpenFailedEvent',
-    'NodeOpeningEvent',
     'NodeRemovedEvent',
     'NodeUpEvent',
     'PartitionHealthReportCreatedEvent',
@@ -917,15 +981,66 @@
     'ClusterUpgradeStartEvent',
     'ChaosStoppedEvent',
     'ChaosStartedEvent',
-    'ChaosRestartNodeFaultCompletedEvent',
     'ChaosRestartCodePackageFaultScheduledEvent',
-    'ChaosRestartCodePackageFaultCompletedEvent',
     'ChaosRemoveReplicaFaultScheduledEvent',
-    'ChaosRemoveReplicaFaultCompletedEvent',
     'ChaosMoveSecondaryFaultScheduledEvent',
     'ChaosMovePrimaryFaultScheduledEvent',
     'ChaosRestartReplicaFaultScheduledEvent',
     'ChaosRestartNodeFaultScheduledEvent',
+    'AutoScalingTrigger',
+    'AutoScalingMechanism',
+    'AutoScalingPolicy',
+    'ServiceResourceDescription',
+    'DiagnosticsSinkProperties',
+    'DiagnosticsDescription',
+    'ApplicationResourceDescription',
+    'ApplicationScopedVolumeCreationParameters',
+    'ApplicationScopedVolumeCreationParametersServiceFabricVolumeDisk',
+    'PagedServiceResourceDescriptionList',
+    'ServiceReplicaDescription',
+    'PagedServiceReplicaDescriptionList',
+    'VolumeProviderParametersAzureFile',
+    'VolumeResourceDescription',
+    'ImageRegistryCredential',
+    'EnvironmentVariable',
+    'Setting',
+    'ContainerLabel',
+    'EndpointProperties',
+    'ResourceRequests',
+    'ResourceLimits',
+    'ResourceRequirements',
+    'VolumeReference',
+    'ApplicationScopedVolume',
+    'ContainerState',
+    'ContainerEvent',
+    'ContainerInstanceView',
+    'DiagnosticsRef',
+    'ReliableCollectionsRef',
+    'ContainerCodePackageProperties',
+    'NetworkRef',
+    'ServiceReplicaProperties',
+    'AutoScalingMetric',
+    'AverageLoadScalingTrigger',
+    'AddRemoveReplicaScalingMechanism',
+    'AutoScalingResourceMetric',
+    'SecretResourceProperties',
+    'SimpleSecretResourceProperties',
+    'SecretValueProperties',
+    'SecretResourcePropertiesBase',
+    'SecretResourceDescription',
+    'PagedSecretResourceDescriptionList',
+    'SecretValueResourceDescription',
+    'PagedSecretValueResourceDescriptionList',
+    'GatewayDestination',
+    'TcpConfig',
+    'HttpRouteMatchPath',
+    'HttpRouteMatchHeader',
+    'HttpRouteMatchRule',
+    'HttpRouteConfig',
+    'HttpHostConfig',
+    'HttpConfig',
+    'GatewayResourceDescription',
+    'PagedGatewayResourceDescriptionList',
     'ApplicationDefinitionKind',
     'HealthState',
     'ApplicationStatus',
@@ -989,6 +1104,7 @@
     'PropertyValueKind',
     'PropertyBatchOperationKind',
     'PropertyBatchInfoKind',
+    'RetentionPolicyType',
     'BackupStorageKind',
     'BackupScheduleKind',
     'BackupPolicyScope',
@@ -1007,6 +1123,18 @@
     'RepairTaskHealthCheckState',
     'ScalingTriggerKind',
     'ScalingMechanismKind',
+    'ServiceResourceStatus',
+    'ApplicationResourceStatus',
+    'ApplicationScopedVolumeKind',
+    'SizeTypes',
+    'DiagnosticsSinkKind',
+    'OperatingSystemTypes',
+    'AutoScalingMechanismKind',
+    'AutoScalingTriggerKind',
+    'AutoScalingMetricKind',
+    'SecretKind',
+    'HeaderMatchType',
+    'GatewayResourceStatus',
     'NodeStatusFilter',
     'ReplicaHealthReportServiceKind',
     'DataLossMode',

customSDK/servicefabric/models/add_remove_replica_scaling_mechanism.py

@@ -0,0 +1,51 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from .auto_scaling_mechanism import AutoScalingMechanism
+
+
+class AddRemoveReplicaScalingMechanism(AutoScalingMechanism):
+    """Describes the horizontal auto scaling mechanism that adds or removes
+    replicas (containers or container groups).
+
+    :param kind: Constant filled by server.
+    :type kind: str
+    :param min_count: Minimum number of containers (scale down won't be
+     performed below this number).
+    :type min_count: int
+    :param max_count: Maximum number of containers (scale up won't be
+     performed above this number).
+    :type max_count: int
+    :param scale_increment: Each time auto scaling is performed, this number
+     of containers will be added or removed.
+    :type scale_increment: int
+    """
+
+    _validation = {
+        'kind': {'required': True},
+        'min_count': {'required': True},
+        'max_count': {'required': True},
+        'scale_increment': {'required': True},
+    }
+
+    _attribute_map = {
+        'kind': {'key': 'kind', 'type': 'str'},
+        'min_count': {'key': 'minCount', 'type': 'int'},
+        'max_count': {'key': 'maxCount', 'type': 'int'},
+        'scale_increment': {'key': 'scaleIncrement', 'type': 'int'},
+    }
+
+    def __init__(self, min_count, max_count, scale_increment):
+        super(AddRemoveReplicaScalingMechanism, self).__init__()
+        self.min_count = min_count
+        self.max_count = max_count
+        self.scale_increment = scale_increment
+        self.kind = 'AddRemoveReplica'

customSDK/servicefabric/models/application_backup_configuration_info.py

@@ -21,9 +21,8 @@ class ApplicationBackupConfigurationInfo(BackupConfigurationInfo):
      this Service Fabric application or service or partition.
     :type policy_name: str
     :param policy_inherited_from: Specifies the scope at which the backup
-     policy is applied.
-     . Possible values include: 'Invalid', 'Partition', 'Service',
-     'Application'
+     policy is applied. Possible values include: 'Invalid', 'Partition',
+     'Service', 'Application'
     :type policy_inherited_from: str or
      ~azure.servicefabric.models.BackupPolicyScope
     :param suspension_info: Describes the backup suspension details.