diff --git a/google-cloud-sdk/.install/.backup/data/cli/gcloud_completions.py b/google-cloud-sdk/.install/.backup/data/cli/gcloud_completions.py index aa4dba31..b0097543 100644 --- a/google-cloud-sdk/.install/.backup/data/cli/gcloud_completions.py +++ b/google-cloud-sdk/.install/.backup/data/cli/gcloud_completions.py @@ -4991,7 +4991,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--enable-stackdriver-kubernetes": "bool", @@ -5004,8 +5004,8 @@ "--local-ssd-volumes": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", - "--master-ipv4-cidr": "value", + "--main-authorized-networks": "value", + "--main-ipv4-cidr": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -5097,13 +5097,13 @@ "--enable-autoscaling": "bool", "--enable-basic-auth": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--generate-password": "bool", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -5134,7 +5134,7 @@ "--cluster-version": "value", "--concurrent-node-count": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -10010,18 +10010,18 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-ca-certificate-path": "value", - "--master-dump-file-path": "value", - "--master-instance-name": "value", - "--master-password": "value", - "--master-username": "value", + "--main-ca-certificate-path": "value", + "--main-dump-file-path": "value", + "--main-instance-name": "value", + "--main-password": "value", + "--main-username": "value", "--memory": "value", "--network": "value", "--pricing-plan": [ "PACKAGE", "PER_USE" ], - "--prompt-for-master-password": "bool", + "--prompt-for-main-password": "bool", "--region": "value", "--replica-type": [ "FAILOVER", @@ -16311,7 +16311,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--enable-stackdriver-kubernetes": "bool", @@ -16322,8 +16322,8 @@ "--local-ssd-count": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", - "--master-ipv4-cidr": "value", + "--main-authorized-networks": "value", + "--main-ipv4-cidr": "value", "--max-nodes": "value", "--max-nodes-per-pool": "value", "--min-cpu-platform": "value", @@ -16408,13 +16408,13 @@ "--enable-autoscaling": "bool", "--enable-basic-auth": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--generate-password": "bool", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-nodes": "value", "--min-nodes": "value", "--monitoring-service": "value", @@ -16438,7 +16438,7 @@ "--async": "bool", "--cluster-version": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -16775,18 +16775,18 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", "--num-workers": "value", @@ -17340,18 +17340,18 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", "--num-workers": "value", @@ -21561,17 +21561,17 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-ca-certificate-path": "value", - "--master-dump-file-path": "value", - "--master-instance-name": "value", - "--master-password": "value", - "--master-username": "value", + "--main-ca-certificate-path": "value", + "--main-dump-file-path": "value", + "--main-instance-name": "value", + "--main-password": "value", + "--main-username": "value", "--memory": "value", "--pricing-plan": [ "PACKAGE", "PER_USE" ], - "--prompt-for-master-password": "bool", + "--prompt-for-main-password": "bool", "--region": "value", "--replica-type": [ "FAILOVER", @@ -25570,7 +25570,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--image-type": "value", "--issue-client-certificate": "bool", @@ -25578,7 +25578,7 @@ "--local-ssd-count": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-nodes": "value", "--max-nodes-per-pool": "value", "--min-cpu-platform": "value", @@ -25655,12 +25655,12 @@ "--enable-autoscaling": "bool", "--enable-basic-auth": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--generate-password": "bool", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-nodes": "value", "--min-nodes": "value", "--monitoring-service": "value", @@ -25684,7 +25684,7 @@ "--async": "bool", "--cluster-version": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -25948,13 +25948,13 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", "--metadata": "value", "--network": "value", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", "--num-workers": "value", @@ -29429,7 +29429,7 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-instance-name": "value", + "--main-instance-name": "value", "--memory": "value", "--pricing-plan": [ "PACKAGE", diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py index 14f6bb94..34a164ad 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py @@ -62,7 +62,7 @@ class InvalidRepositoryError(exceptions.Error): """Attempted to fetch or clone from a repository missing something basic. This gets raised if we try to fetch or clone from a repo that is either - missing a HEAD or missing both a "latest" tag and a master branch. + missing a HEAD or missing both a "latest" tag and a main branch. """ @@ -147,7 +147,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): Returns: (str, dulwich.objects.Commit) The tag that was actually pulled (we try to - get "latest" but fall back to "master") and the commit object + get "latest" but fall back to "main") and the commit object associated with it. Raises: @@ -164,7 +164,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): # Try to get the "latest" tag (latest released version) revision = None tag = None - for tag in (b'refs/tags/latest', b'refs/heads/master'): + for tag in (b'refs/tags/latest', b'refs/heads/main'): try: log.debug('looking up ref %s', tag) revision = local_repo[tag] @@ -173,7 +173,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): log.warning('Unable to checkout branch %s', tag) else: - raise AssertionError('No "refs/heads/master" tag found in repository.') + raise AssertionError('No "refs/heads/main" tag found in repository.') return tag, revision @@ -258,7 +258,7 @@ def InstallRuntimeDef(url, target_dir): directory. At this time, the runtime definition url must be the URL of a git repository and we identify the tree to checkout based on 1) the presence of a "latest" tag ("refs/tags/latest") 2) if there is no "latest" tag, the - head of the "master" branch ("refs/heads/master"). + head of the "main" branch ("refs/heads/main"). Args: url: (str) A URL identifying a git repository. The HTTP, TCP and local diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/api_adapter.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/api_adapter.py index 82448e08..0b6f58d5 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/api_adapter.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/api_adapter.py @@ -50,8 +50,8 @@ """ MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG = """\ -Cannot use --master-authorized-networks \ -if --enable-master-authorized-networks is not \ +Cannot use --main-authorized-networks \ +if --enable-main-authorized-networks is not \ specified.""" NO_AUTOPROVISIONING_MSG = """\ @@ -329,8 +329,8 @@ def __init__(self, enable_autorepair=None, enable_autoupgrade=None, service_account=None, - enable_master_authorized_networks=None, - master_authorized_networks=None, + enable_main_authorized_networks=None, + main_authorized_networks=None, enable_legacy_authorization=None, labels=None, disk_type=None, @@ -348,7 +348,7 @@ def __init__(self, enable_pod_security_policy=None, allow_route_overlap=None, private_cluster=None, - master_ipv4_cidr=None, + main_ipv4_cidr=None, tpu_ipv4_cidr=None, enable_tpu=None, default_max_pods_per_node=None, @@ -392,8 +392,8 @@ def __init__(self, self.enable_autorepair = enable_autorepair self.enable_autoupgrade = enable_autoupgrade self.service_account = service_account - self.enable_master_authorized_networks = enable_master_authorized_networks - self.master_authorized_networks = master_authorized_networks + self.enable_main_authorized_networks = enable_main_authorized_networks + self.main_authorized_networks = main_authorized_networks self.enable_legacy_authorization = enable_legacy_authorization self.enable_network_policy = enable_network_policy self.labels = labels @@ -411,7 +411,7 @@ def __init__(self, self.enable_pod_security_policy = enable_pod_security_policy self.allow_route_overlap = allow_route_overlap self.private_cluster = private_cluster - self.master_ipv4_cidr = master_ipv4_cidr + self.main_ipv4_cidr = main_ipv4_cidr self.tpu_ipv4_cidr = tpu_ipv4_cidr self.enable_tpu = enable_tpu self.issue_client_certificate = issue_client_certificate @@ -424,7 +424,7 @@ class UpdateClusterOptions(object): def __init__(self, version=None, - update_master=None, + update_main=None, update_nodes=None, node_pool=None, monitoring_service=None, @@ -436,14 +436,14 @@ def __init__(self, image=None, image_project=None, locations=None, - enable_master_authorized_networks=None, - master_authorized_networks=None, + enable_main_authorized_networks=None, + main_authorized_networks=None, enable_autoprovisioning=None, enable_pod_security_policy=None, enable_binauthz=None, concurrent_node_count=None): self.version = version - self.update_master = bool(update_master) + self.update_main = bool(update_main) self.update_nodes = bool(update_nodes) self.node_pool = node_pool self.monitoring_service = monitoring_service @@ -455,16 +455,16 @@ def __init__(self, self.image = image self.image_project = image_project self.locations = locations - self.enable_master_authorized_networks = enable_master_authorized_networks - self.master_authorized_networks = master_authorized_networks + self.enable_main_authorized_networks = enable_main_authorized_networks + self.main_authorized_networks = main_authorized_networks self.enable_autoprovisioning = enable_autoprovisioning self.enable_pod_security_policy = enable_pod_security_policy self.enable_binauthz = enable_binauthz self.concurrent_node_count = concurrent_node_count -class SetMasterAuthOptions(object): - """Options to pass to SetMasterAuth.""" +class SetMainAuthOptions(object): + """Options to pass to SetMainAuth.""" SET_PASSWORD = 'SetPassword' GENERATE_PASSWORD = 'GeneratePassword' @@ -830,7 +830,7 @@ def CreateClusterCommon(self, cluster_ref, options): cluster = self.messages.Cluster( name=cluster_ref.clusterId, nodePools=pools, - masterAuth=self.messages.MasterAuth(username=options.user, + mainAuth=self.messages.MainAuth(username=options.user, password=options.password)) if options.additional_zones: cluster.locations = sorted([cluster_ref.zone] + options.additional_zones) @@ -856,17 +856,17 @@ def CreateClusterCommon(self, cluster_ref, options): disable_network_policy=( NETWORK_POLICY not in options.addons)) cluster.addonsConfig = addons - if options.enable_master_authorized_networks: - authorized_networks = self.messages.MasterAuthorizedNetworksConfig( - enabled=options.enable_master_authorized_networks) - if options.master_authorized_networks: - for network in options.master_authorized_networks: + if options.enable_main_authorized_networks: + authorized_networks = self.messages.MainAuthorizedNetworksConfig( + enabled=options.enable_main_authorized_networks) + if options.main_authorized_networks: + for network in options.main_authorized_networks: authorized_networks.cidrBlocks.append(self.messages.CidrBlock( cidrBlock=network)) - cluster.masterAuthorizedNetworksConfig = authorized_networks - elif options.master_authorized_networks: - # Raise error if use --master-authorized-networks without - # --enable-master-authorized-networks. + cluster.mainAuthorizedNetworksConfig = authorized_networks + elif options.main_authorized_networks: + # Raise error if use --main-authorized-networks without + # --enable-main-authorized-networks. raise util.Error(MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG) if options.enable_kubernetes_alpha: @@ -912,7 +912,7 @@ def CreateClusterCommon(self, cluster_ref, options): enabled=options.enable_pod_security_policy) if options.issue_client_certificate is not None: - cluster.masterAuth.clientCertificateConfig = ( + cluster.mainAuth.clientCertificateConfig = ( self.messages.ClientCertificateConfig( issueClientCertificate=options.issue_client_certificate)) @@ -987,7 +987,7 @@ def ParseAllowRouteOverlapOptions(self, options, cluster): def ParsePrivateClusterOptions(self, options, cluster): """Parses the options for Private Clusters.""" if options.private_cluster: - cluster.masterIpv4CidrBlock = options.master_ipv4_cidr + cluster.mainIpv4CidrBlock = options.main_ipv4_cidr cluster.privateCluster = options.private_cluster return cluster @@ -1030,9 +1030,9 @@ def UpdateClusterCommon(self, options): desiredImageType=options.image_type, desiredImage=options.image, desiredImageProject=options.image_project) - elif options.update_master: + elif options.update_main: update = self.messages.ClusterUpdate( - desiredMasterVersion=options.version) + desiredMainVersion=options.version) elif options.monitoring_service: update = self.messages.ClusterUpdate( desiredMonitoringService=options.monitoring_service) @@ -1055,16 +1055,16 @@ def UpdateClusterCommon(self, options): desiredNodePoolAutoscaling=autoscaling) elif options.locations: update = self.messages.ClusterUpdate(desiredLocations=options.locations) - elif options.enable_master_authorized_networks is not None: + elif options.enable_main_authorized_networks is not None: # For update, we can either enable or disable. - authorized_networks = self.messages.MasterAuthorizedNetworksConfig( - enabled=options.enable_master_authorized_networks) - if options.master_authorized_networks: - for network in options.master_authorized_networks: + authorized_networks = self.messages.MainAuthorizedNetworksConfig( + enabled=options.enable_main_authorized_networks) + if options.main_authorized_networks: + for network in options.main_authorized_networks: authorized_networks.cidrBlocks.append(self.messages.CidrBlock( cidrBlock=network)) update = self.messages.ClusterUpdate( - desiredMasterAuthorizedNetworksConfig=authorized_networks) + desiredMainAuthorizedNetworksConfig=authorized_networks) elif options.enable_autoprovisioning is not None: autoscaling = self.CreateClusterAutoscalingCommon(options) update = self.messages.ClusterUpdate( @@ -1080,10 +1080,10 @@ def UpdateClusterCommon(self, options): update = self.messages.ClusterUpdate( desiredBinaryAuthorization=binary_authorization) - if (options.master_authorized_networks - and not options.enable_master_authorized_networks): - # Raise error if use --master-authorized-networks without - # --enable-master-authorized-networks. + if (options.main_authorized_networks + and not options.enable_main_authorized_networks): + # Raise error if use --main-authorized-networks without + # --enable-main-authorized-networks. raise util.Error(MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG) return update @@ -1214,29 +1214,29 @@ def SetNetworkPolicy(self, cluster_ref, options): self.client.projects_locations_clusters.SetNetworkPolicy(req).name, cluster_ref.zone) - def SetMasterAuthCommon(self, options): - """Returns a SetMasterAuth action.""" - update = self.messages.MasterAuth( + def SetMainAuthCommon(self, options): + """Returns a SetMainAuth action.""" + update = self.messages.MainAuth( username=options.username, password=options.password) - if options.action == SetMasterAuthOptions.SET_PASSWORD: - action = (self.messages.SetMasterAuthRequest. + if options.action == SetMainAuthOptions.SET_PASSWORD: + action = (self.messages.SetMainAuthRequest. ActionValueValuesEnum.SET_PASSWORD) - elif options.action == SetMasterAuthOptions.GENERATE_PASSWORD: - action = (self.messages.SetMasterAuthRequest. + elif options.action == SetMainAuthOptions.GENERATE_PASSWORD: + action = (self.messages.SetMainAuthRequest. ActionValueValuesEnum.GENERATE_PASSWORD) - else: # options.action == SetMasterAuthOptions.SET_USERNAME + else: # options.action == SetMainAuthOptions.SET_USERNAME action = ( - self.messages.SetMasterAuthRequest.ActionValueValuesEnum.SET_USERNAME) + self.messages.SetMainAuthRequest.ActionValueValuesEnum.SET_USERNAME) return update, action - def SetMasterAuth(self, cluster_ref, options): - update, action = self.SetMasterAuthCommon(options) - req = self.messages.SetMasterAuthRequest( + def SetMainAuth(self, cluster_ref, options): + update, action = self.SetMainAuthCommon(options) + req = self.messages.SetMainAuthRequest( name=ProjectLocationCluster(cluster_ref.projectId, cluster_ref.zone, cluster_ref.clusterId), action=action, update=update) - op = self.client.projects_locations_clusters.SetMasterAuth(req) + op = self.client.projects_locations_clusters.SetMainAuth(req) return self.ParseOperation(op.name, cluster_ref.zone) def StartIpRotation(self, cluster_ref, rotate_credentials): diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/kubeconfig.py index 01249faf..861a166b 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/kubeconfig.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/kubeconfig.py @@ -224,7 +224,7 @@ def _AuthProvider(name='gcp'): Constructs an auth provider config entry readable by kubectl. This tells kubectl to call out to a specific gcloud command and parse the output to - retrieve access tokens to authenticate to the kubernetes master. + retrieve access tokens to authenticate to the kubernetes main. Kubernetes gcp auth provider plugin at https://github.com/kubernetes/kubernetes/tree/master/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/transforms.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/transforms.py index 488efda3..4b1e78c5 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/transforms.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/transforms.py @@ -66,16 +66,16 @@ def ParseExpireTime(s): return expire_dt - times.Now(expire_dt.tzinfo) -def TransformMasterVersion(r, undefined=''): - """Returns the formatted master version. +def TransformMainVersion(r, undefined=''): + """Returns the formatted main version. Args: r: JSON-serializable object. undefined: Returns this value if the resource cannot be formatted. Returns: - The formatted master version. + The formatted main version. """ - version = r.get('currentMasterVersion', None) + version = r.get('currentMainVersion', None) if version is None: return undefined if r.get('enableKubernetesAlpha', False): @@ -94,7 +94,7 @@ def TransformMasterVersion(r, undefined=''): _TRANSFORMS = { - 'master_version': TransformMasterVersion, + 'main_version': TransformMainVersion, } diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/util.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/util.py index d6605f01..6a40a92d 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/util.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/container/util.py @@ -34,7 +34,7 @@ table( name, zone:label=LOCATION, - master_version():label=MASTER_VERSION, + main_version():label=MASTER_VERSION, endpoint:label=MASTER_IP, nodePools[0].config.machineType, currentNodeVersion:label=NODE_VERSION, @@ -243,7 +243,7 @@ def Persist(cls, cluster, project_id): 'project_id': project_id, 'server': 'https://' + cluster.endpoint, } - auth = cluster.masterAuth + auth = cluster.mainAuth if auth and auth.clusterCaCertificate: kwargs['ca_data'] = auth.clusterCaCertificate else: diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/dns/import_util.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/dns/import_util.py index bcb98e47..609b85d5 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/dns/import_util.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/dns/import_util.py @@ -77,7 +77,7 @@ def _SOATranslation(rdata, origin): Returns: str, The translation of the given SOA rdata which includes all the required - SOA fields. Note that the master NS name is left in a substitutable form + SOA fields. Note that the main NS name is left in a substitutable form because it is always provided by Cloud DNS. """ return ' '.join( @@ -272,7 +272,7 @@ def RecordSetsFromZoneFile(zone_file, domain, api_version='v1'): A (name, type) keyed dict of ResourceRecordSets that were obtained from the zone file. Note that only A, AAAA, CNAME, MX, PTR, SOA, SPF, SRV, and TXT record-sets are retrieved. Other record-set types are not supported by Cloud - DNS. Also, the master NS field for SOA records is discarded since that is + DNS. Also, the main NS field for SOA records is discarded since that is provided by Cloud DNS. """ zone_contents = zone.from_file(zone_file, domain, check_origin=False) @@ -296,7 +296,7 @@ def RecordSetsFromYamlFile(yaml_file, api_version='v1'): A (name, type) keyed dict of ResourceRecordSets that were obtained from the yaml file. Note that only A, AAAA, CNAME, MX, PTR, SOA, SPF, SRV, and TXT record-sets are retrieved. Other record-set types are not supported by Cloud - DNS. Also, the master NS field for SOA records is discarded since that is + DNS. Also, the main NS field for SOA records is discarded since that is provided by Cloud DNS. """ record_sets = {} @@ -317,7 +317,7 @@ def RecordSetsFromYamlFile(yaml_file, api_version='v1'): record_set.rrdatas = yaml_record_set['rrdatas'] if rdata_type is rdatatype.SOA: - # Make master NS name substitutable. + # Make main NS name substitutable. record_set.rrdatas[0] = re.sub(r'\S+', '{0}', record_set.rrdatas[0], count=1) @@ -347,7 +347,7 @@ def _RecordSetCopy(record_set, api_version='v1'): def _SOAReplacement(current_record, record_to_be_imported, api_version='v1'): - """Returns the replacement SOA record with restored master NS name. + """Returns the replacement SOA record with restored main NS name. Args: current_record: ResourceRecordSet, Current record-set. @@ -355,7 +355,7 @@ def _SOAReplacement(current_record, record_to_be_imported, api_version='v1'): api_version: [str], the api version to use for creating the records. Returns: - ResourceRecordSet, the replacement SOA record with restored master NS name. + ResourceRecordSet, the replacement SOA record with restored main NS name. """ replacement = _RecordSetCopy(record_to_be_imported, api_version=api_version) replacement.rrdatas[0] = replacement.rrdatas[0].format( diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py index 97a4e839..3ed8ced3 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py @@ -234,7 +234,7 @@ def MachineType(instance=None, tier=None, memory=None, cpu=None): def OnPremisesConfiguration(sql_messages, source_ip_address, source_port): - """Generates the external master configuration for the instance. + """Generates the external main configuration for the instance. Args: sql_messages: module, The messages module that should be used. @@ -268,21 +268,21 @@ def PrivateNetworkUrl(network): def ReplicaConfiguration(sql_messages, - master_username, - master_password, - master_dump_file_path, - master_ca_certificate_path=None, + main_username, + main_password, + main_dump_file_path, + main_ca_certificate_path=None, client_certificate_path=None, client_key_path=None): - """Generates the config for an external master replica. + """Generates the config for an external main replica. Args: sql_messages: module, The messages module that should be used. - master_username: The username for connecting to the external instance. - master_password: The password for connecting to the external instance. - master_dump_file_path: ObjectReference, a wrapper for the URI of the Cloud + main_username: The username for connecting to the external instance. + main_password: The password for connecting to the external instance. + main_dump_file_path: ObjectReference, a wrapper for the URI of the Cloud Storage path containing the dumpfile to seed the replica with. - master_ca_certificate_path: The path to the CA certificate PEM file. + main_ca_certificate_path: The path to the CA certificate PEM file. client_certificate_path: The path to the client certificate PEM file. client_key_path: The path to the client private key PEM file. @@ -290,12 +290,12 @@ def ReplicaConfiguration(sql_messages, sql_messages.MySqlReplicaConfiguration object. """ mysql_replica_configuration = sql_messages.MySqlReplicaConfiguration( - username=master_username, - password=master_password, - dumpFilePath=master_dump_file_path.ToUrl()) - if master_ca_certificate_path: + username=main_username, + password=main_password, + dumpFilePath=main_dump_file_path.ToUrl()) + if main_ca_certificate_path: mysql_replica_configuration.caCertificate = files.ReadFileContents( - master_ca_certificate_path) + main_ca_certificate_path) if client_certificate_path: mysql_replica_configuration.clientCertificate = files.ReadFileContents( client_certificate_path) diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/composer/util.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/composer/util.py index 1281e970..480abb47 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/composer/util.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/composer/util.py @@ -162,7 +162,7 @@ def TemporaryKubeconfig(location_id, cluster_id): gke_api = gke_api_adapter.NewAPIAdapter(GKE_API_VERSION) cluster_ref = gke_api.ParseCluster(cluster_id, location_id) cluster = gke_api.GetCluster(cluster_ref) - auth = cluster.masterAuth + auth = cluster.mainAuth missing_creds = not (auth and auth.clientCertificate and auth.clientKey) if missing_creds and not gke_util.ClusterConfig.UseGCPAuthProvider(): raise Error('Unable to get cluster credentials. User must have edit ' diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/constants.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/constants.py index 399f5f66..a95dd6f7 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/constants.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/constants.py @@ -32,7 +32,7 @@ "This will create a cluster with all Kubernetes Alpha features enabled.\n" "- This cluster will not be covered by the Kubernetes Engine SLA and should" " not be used for production workloads.\n" - "- You will not be able to upgrade the master or nodes.\n" + "- You will not be able to upgrade the main or nodes.\n" "- The cluster will be deleted after 30 days.\n" ) diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/container_command_util.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/container_command_util.py index 66989d87..13b5098e 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/container_command_util.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/container_command_util.py @@ -41,14 +41,14 @@ def _NodePoolFromCluster(cluster, node_pool_name): node_pool_name)) -def ClusterUpgradeMessage(name, cluster=None, master=False, node_pool_name=None, +def ClusterUpgradeMessage(name, cluster=None, main=False, node_pool_name=None, new_version=None, concurrent_node_count=None): """Get a message to print during gcloud container clusters upgrade. Args: name: str, the name of the cluster being upgraded. cluster: the cluster object. - master: bool, if the upgrade applies to the master version. + main: bool, if the upgrade applies to the main version. node_pool_name: str, the name of the node pool if the upgrade is for a specific node pool. new_version: str, the name of the new version, if given. @@ -65,11 +65,11 @@ def ClusterUpgradeMessage(name, cluster=None, master=False, node_pool_name=None, if new_version: new_version_message = 'version [{}]'.format(new_version) else: - new_version_message = 'master version' - if master: - node_message = 'Master' + new_version_message = 'main version' + if main: + node_message = 'Main' if cluster: - current_version = cluster.currentMasterVersion + current_version = cluster.currentMainVersion elif node_pool_name: node_message = 'All nodes in node pool [{}]'.format(node_pool_name) if cluster: @@ -83,7 +83,7 @@ def ClusterUpgradeMessage(name, cluster=None, master=False, node_pool_name=None, else: node_message = 'All nodes' concurrent_message = '' - if not master and concurrent_node_count: + if not main and concurrent_node_count: concurrent_message = '{} {} will be upgraded at a time. '.format( concurrent_node_count, text.Pluralize(concurrent_node_count, 'node')) @@ -183,5 +183,5 @@ def ParseUpdateOptionsBase(args, locations): max_nodes=args.max_nodes, node_pool=args.node_pool, locations=locations, - enable_master_authorized_networks=args.enable_master_authorized_networks, - master_authorized_networks=args.master_authorized_networks) + enable_main_authorized_networks=args.enable_main_authorized_networks, + main_authorized_networks=args.main_authorized_networks) diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/flags.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/flags.py index 4b68de9f..473f5764 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/flags.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/container/flags.py @@ -175,7 +175,7 @@ def AddClusterVersionFlag(parser, suppressed=False, help=None): # pylint: disab """Adds a --cluster-version flag to the given parser.""" if help is None: help = """\ -The Kubernetes version to use for the master and nodes. Defaults to +The Kubernetes version to use for the main and nodes. Defaults to server-specified. The default Kubernetes version is available using the following command. @@ -677,56 +677,56 @@ def AddTagsFlag(parser, help_text): help=help_text) -def AddMasterAuthorizedNetworksFlags(parser, enable_group_for_update=None): - """Adds Master Authorized Networks related flags to parser. +def AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=None): + """Adds Main Authorized Networks related flags to parser. - Master Authorized Networks related flags are: - --enable-master-authorized-networks --master-authorized-networks. + Main Authorized Networks related flags are: + --enable-main-authorized-networks --main-authorized-networks. Args: parser: A given parser. enable_group_for_update: An optional group of mutually exclusive flag - options to which an --enable-master-authorized-networks flag is added + options to which an --enable-main-authorized-networks flag is added in an update command. If given, the flag will default to None instead of False. """ if enable_group_for_update is None: # Flags are being added to the same group. - master_flag_group = parser.add_argument_group('Master Authorized Networks') - enable_flag_group = master_flag_group + main_flag_group = parser.add_argument_group('Main Authorized Networks') + enable_flag_group = main_flag_group enable_default = False else: # Flags are being added to different groups, so the new one should have no # help text (has only one arg). - master_flag_group = parser.add_argument_group('') + main_flag_group = parser.add_argument_group('') enable_flag_group = enable_group_for_update enable_default = None enable_flag_group.add_argument( - '--enable-master-authorized-networks', + '--enable-main-authorized-networks', default=enable_default, help="""\ Allow only specified set of CIDR blocks (specified by the -`--master-authorized-networks` flag) to connect to Kubernetes master through +`--main-authorized-networks` flag) to connect to Kubernetes main through HTTPS. Besides these blocks, the following have access as well:\n 1) The private network the cluster connects to if `--private-cluster` is specified. 2) Google Compute Engine Public IPs if `--private-cluster` is not specified.\n When disabled, public internet (0.0.0.0/0) is allowed to connect to Kubernetes -master through HTTPS. +main through HTTPS. """, action='store_true') - master_flag_group.add_argument( - '--master-authorized-networks', + main_flag_group.add_argument( + '--main-authorized-networks', type=arg_parsers.ArgList( min_length=1, max_length=api_adapter.MAX_AUTHORIZED_NETWORKS_CIDRS), metavar='NETWORK', help='The list of CIDR blocks (up to {max}) that are allowed to connect ' - 'to Kubernetes master through HTTPS. Specified in CIDR notation (e.g. ' + 'to Kubernetes main through HTTPS. Specified in CIDR notation (e.g. ' '1.2.3.4/30). Can not be specified unless ' - '`--enable-master-authorized-networks` is also specified.'.format( + '`--enable-main-authorized-networks` is also specified.'.format( max=api_adapter.MAX_AUTHORIZED_NETWORKS_CIDRS)) @@ -739,12 +739,12 @@ def AddNetworkPolicyFlags(parser, hidden=False): hidden=hidden, help='Enable network policy enforcement for this cluster. If you are ' 'enabling network policy on an existing cluster the network policy ' - 'addon must first be enabled on the master by using ' + 'addon must first be enabled on the main by using ' '--update-addons=NetworkPolicy=ENABLED flag.') def AddPrivateClusterFlags(parser, hidden=False): - """Adds --private-cluster flag to parser and --master-ipv4-cidr to parser.""" + """Adds --private-cluster flag to parser and --main-ipv4-cidr to parser.""" group = parser.add_argument_group('Private Clusters') group.add_argument( '--private-cluster', @@ -755,8 +755,8 @@ def AddPrivateClusterFlags(parser, hidden=False): required=True, hidden=hidden) group.add_argument( - '--master-ipv4-cidr', - help=('IPv4 CIDR range to use for the master network. This should be a ' + '--main-ipv4-cidr', + help=('IPv4 CIDR range to use for the main network. This should be a ' '/28 and should be used in conjunction with the --private-cluster ' 'flag.'), default=None, @@ -1206,7 +1206,7 @@ def AddNodeLocationsFlag(parser): metavar='ZONE', help="""\ The set of zones in which the specified node footprint should be replicated. -All zones must be in the same region as the cluster's master(s), specified by +All zones must be in the same region as the cluster's main(s), specified by the `--zone` or `--region` flag. Additionally, for zonal clusters, `--node-locations` must contain the cluster's primary zone. If not specified, all nodes will be in the cluster's primary zone (for zonal clusters) or spread @@ -1492,7 +1492,7 @@ def AddIssueClientCertificateFlag(parser): Issue a TLS client certificate with admin permissions. When enabled, the certificate and private key pair will be present in -MasterAuth field of the Cluster object. +MainAuth field of the Cluster object. """ parser.add_argument( '--issue-client-certificate', diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/clusters.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/clusters.py index 44b2af9b..3b47a95b 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/clusters.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/clusters.py @@ -67,7 +67,7 @@ def ArgsForClusterRef(parser, beta=False): help="""\ Create a single node cluster. - A single node cluster has all master and worker components. + A single node cluster has all main and worker components. It cannot have any separate worker nodes. If this flag is not specified, a cluster with separate workers is created. """) @@ -84,8 +84,8 @@ def ArgsForClusterRef(parser, beta=False): help='The number of preemptible worker nodes in the cluster.') parser.add_argument( - '--master-machine-type', - help='The type of machine to use for the master. Defaults to ' + '--main-machine-type', + help='The type of machine to use for the main. Defaults to ' 'server-specified.') parser.add_argument( '--worker-machine-type', @@ -128,9 +128,9 @@ def ArgsForClusterRef(parser, beta=False): type=int, help='The number of local SSDs to attach to each worker in a cluster.') parser.add_argument( - '--num-master-local-ssds', + '--num-main-local-ssds', type=int, - help='The number of local SSDs to attach to the master in a cluster.') + help='The number of local SSDs to attach to the main in a cluster.') parser.add_argument( '--initialization-actions', type=arg_parsers.ArgList(min_length=1), @@ -145,17 +145,17 @@ def ArgsForClusterRef(parser, beta=False): help=('The maximum duration of each initialization action. See ' '$ gcloud topic datetimes for information on duration formats.')) parser.add_argument( - '--num-masters', + '--num-mains', type=arg_parsers.CustomFunctionValidator( lambda n: int(n) in [1, 3], - 'Number of masters must be 1 (Standard) or 3 (High Availability)', + 'Number of mains must be 1 (Standard) or 3 (High Availability)', parser=arg_parsers.BoundedInt(1, 3)), help="""\ - The number of master nodes in the cluster. + The number of main nodes in the cluster. [format="csv",options="header"] |======== - Number of Masters,Cluster Mode + Number of Mains,Cluster Mode 1,Standard 3,High Availability |======== @@ -245,19 +245,19 @@ def ArgsForClusterRef(parser, beta=False): aliases=compute_helpers.SCOPE_ALIASES_FOR_HELP, scope_deprecation_msg=compute_constants.DEPRECATED_SCOPES_MESSAGES)) - master_boot_disk_size = parser.add_mutually_exclusive_group() + main_boot_disk_size = parser.add_mutually_exclusive_group() worker_boot_disk_size = parser.add_mutually_exclusive_group() # Deprecated, to be removed at a future date. - master_boot_disk_size.add_argument( - '--master-boot-disk-size-gb', + main_boot_disk_size.add_argument( + '--main-boot-disk-size-gb', action=actions.DeprecationAction( - '--master-boot-disk-size-gb', - warn=('The `--master-boot-disk-size-gb` flag is deprecated. ' - 'Use `--master-boot-disk-size` flag with "GB" after value.')), + '--main-boot-disk-size-gb', + warn=('The `--main-boot-disk-size-gb` flag is deprecated. ' + 'Use `--main-boot-disk-size` flag with "GB" after value.')), type=int, hidden=True, - help='Use `--master-boot-disk-size` flag with "GB" after value.') + help='Use `--main-boot-disk-size` flag with "GB" after value.') worker_boot_disk_size.add_argument( '--worker-boot-disk-size-gb', action=actions.DeprecationAction( @@ -275,8 +275,8 @@ def ArgsForClusterRef(parser, beta=False): ``10GB'' will produce a 10 gigabyte disk. The minimum size a boot disk can have is 10 GB. Disk size must be a multiple of 1 GB. """ - master_boot_disk_size.add_argument( - '--master-boot-disk-size', + main_boot_disk_size.add_argument( + '--main-boot-disk-size', type=arg_parsers.BinarySize(lower_bound='10GB'), help=boot_disk_size_detailed_help) worker_boot_disk_size.add_argument( @@ -307,7 +307,7 @@ def ArgsForClusterRef(parser, beta=False): ``pd-ssd''. """ parser.add_argument( - '--master-boot-disk-type', help=boot_disk_type_detailed_help) + '--main-boot-disk-type', help=boot_disk_type_detailed_help) parser.add_argument( '--worker-boot-disk-type', help=boot_disk_type_detailed_help) parser.add_argument( @@ -328,14 +328,14 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): Returns: cluster_config: Dataproc cluster configuration """ - master_accelerator_type = None + main_accelerator_type = None worker_accelerator_type = None - master_accelerator_count = None + main_accelerator_count = None worker_accelerator_count = None if beta: - if args.master_accelerator: - master_accelerator_type = args.master_accelerator['type'] - master_accelerator_count = args.master_accelerator.get('count', 1) + if args.main_accelerator: + main_accelerator_type = args.main_accelerator['type'] + main_accelerator_count = args.main_accelerator.get('count', 1) if args.worker_accelerator: worker_accelerator_type = args.worker_accelerator['type'] worker_accelerator_count = args.worker_accelerator.get('count', 1) @@ -371,9 +371,9 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): software_config = dataproc.messages.SoftwareConfig( imageVersion=args.image_version) - master_boot_disk_size_gb = args.master_boot_disk_size_gb - if args.master_boot_disk_size: - master_boot_disk_size_gb = (api_utils.BytesToGb(args.master_boot_disk_size)) + main_boot_disk_size_gb = args.main_boot_disk_size_gb + if args.main_boot_disk_size: + main_boot_disk_size_gb = (api_utils.BytesToGb(args.main_boot_disk_size)) worker_boot_disk_size_gb = args.worker_boot_disk_size_gb if args.worker_boot_disk_size: @@ -408,12 +408,12 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): gce_cluster_config.metadata = encoding.DictToMessage( flat_metadata, dataproc.messages.GceClusterConfig.MetadataValue) - master_accelerators = [] - if master_accelerator_type: - master_accelerators.append( + main_accelerators = [] + if main_accelerator_type: + main_accelerators.append( dataproc.messages.AcceleratorConfig( - acceleratorTypeUri=master_accelerator_type, - acceleratorCount=master_accelerator_count)) + acceleratorTypeUri=main_accelerator_type, + acceleratorCount=main_accelerator_count)) worker_accelerators = [] if worker_accelerator_type: worker_accelerators.append( @@ -424,16 +424,16 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): cluster_config = dataproc.messages.ClusterConfig( configBucket=args.bucket, gceClusterConfig=gce_cluster_config, - masterConfig=dataproc.messages.InstanceGroupConfig( - numInstances=args.num_masters, + mainConfig=dataproc.messages.InstanceGroupConfig( + numInstances=args.num_mains, imageUri=image_ref and image_ref.SelfLink(), - machineTypeUri=args.master_machine_type, - accelerators=master_accelerators, + machineTypeUri=args.main_machine_type, + accelerators=main_accelerators, diskConfig=GetDiskConfig( dataproc, - args.master_boot_disk_type if beta else None, - master_boot_disk_size_gb, - args.num_master_local_ssds + args.main_boot_disk_type if beta else None, + main_boot_disk_size_gb, + args.num_main_local_ssds )), workerConfig=dataproc.messages.InstanceGroupConfig( numInstances=args.num_workers, @@ -451,7 +451,7 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): ) if beta: - cluster_config.masterConfig.minCpuPlatform = args.master_min_cpu_platform + cluster_config.mainConfig.minCpuPlatform = args.main_min_cpu_platform cluster_config.workerConfig.minCpuPlatform = args.worker_min_cpu_platform if beta: diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/flags.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/flags.py index 36322596..0de80ce3 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/flags.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/dataproc/flags.py @@ -117,7 +117,7 @@ def AddParametersFlag(parser): def AddMinCpuPlatformArgs(parser, track): - """Add mininum CPU platform flags for both master and worker instances.""" + """Add mininum CPU platform flags for both main and worker instances.""" help_text = """\ When specified, the VM will be scheduled on host with specified CPU architecture or a newer one. To list available CPU platforms in given @@ -133,7 +133,7 @@ def AddMinCpuPlatformArgs(parser, track): https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform """.format(track.prefix + ' ' if track.prefix else '') parser.add_argument( - '--master-min-cpu-platform', + '--main-min-cpu-platform', metavar='PLATFORM', required=False, help=help_text) diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py index 7400f20b..82639cc4 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py @@ -119,7 +119,7 @@ def _AddDefaultBranch(source_archive_url): r'/projects/[^/]+' r'/repos/[^/]+$') if re.match(cloud_repo_pattern, source_archive_url): - return source_archive_url + '/moveable-aliases/master' + return source_archive_url + '/moveable-aliases/main' return source_archive_url diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/flags.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/flags.py index ff82f96b..c8f33a39 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/flags.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/functions/flags.py @@ -124,9 +124,9 @@ def AddSourceFlag(parser): `https://source.developers.google.com/projects/${PROJECT}/repos/${REPO}` By using the URL above, sources from the root directory of the repository - on the revision tagged `master` will be used. + on the revision tagged `main` will be used. - If you want to deploy from a revision different from `master`, append one + If you want to deploy from a revision different from `main`, append one of the following three sources to the URL: 1. `/revisions/${REVISION}`, diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/flags.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/flags.py index e51d2bd0..3d176a85 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/flags.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/flags.py @@ -55,7 +55,7 @@ pythonModule, parameterServerType:optional, parameterServerCount:optional, - masterType:optional, + mainType:optional, workerType:optional, workerCount:optional, jobDir:optional diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py index d3b00783..892ad503 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py @@ -86,8 +86,8 @@ cluster specification. When you use this tier, set values to configure your processing cluster according to these guidelines (using the --config flag): -* You _must_ set `TrainingInput.masterType` to specify the type of machine to - use for your master node. This is the only required setting. +* You _must_ set `TrainingInput.mainType` to specify the type of machine to + use for your main node. This is the only required setting. * You _may_ set `TrainingInput.workerCount` to specify the number of workers to use. If you specify one or more workers, you _must_ also set `TrainingInput.workerType` to specify the type of machine to use for your @@ -97,8 +97,8 @@ _must_ also set `TrainingInput.parameterServerType` to specify the type of machine to use for your parameter servers. Note that all of your workers must use the same machine type, which can be different from your parameter server - type and master type. Your parameter servers must likewise use the same - machine type, which can be different from your worker type and master type.\ + type and main type. Your parameter servers must likewise use the same + machine type, which can be different from your worker type and main type.\ """) } diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/local_train.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/local_train.py index 5bd244fd..ec964367 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/local_train.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/ml_engine/local_train.py @@ -37,7 +37,7 @@ def MakeProcess(module_name, **extra_popen_args): """Make a Popen object that runs the module, with the correct env. - If task_type is 'master' instead replaces the current process with the + If task_type is 'main' instead replaces the current process with the subprocess via execution_utils.Exec Args: module_name: str. Name of the module to run, e.g. trainer.task @@ -53,7 +53,7 @@ def MakeProcess(module_name, Returns: a subprocess.Popen object corresponding to the subprocesses or an int corresponding to the return value of the subprocess - (if task_type is 'master') + (if task_type is 'main') Raises: RuntimeError: if there is no python executable on the user system """ @@ -80,7 +80,7 @@ def MakeProcess(module_name, # configuration options to the training module. the module specific # arguments are passed as command line arguments. env['TF_CONFIG'] = json.dumps(config) - if task_type == 'master': + if task_type == 'main': return execution_utils.Exec( cmd, env=env, no_exit=True, cwd=package_root, **extra_popen_args) else: @@ -113,18 +113,18 @@ def RunDistributed(module_name, user_args: [str]. Additional user args for the task. Any relative paths will not work. Returns: - int. the retval of 'master' subprocess + int. the retval of 'main' subprocess """ ports = list(range(start_port, start_port + num_ps + num_workers + 1)) cluster = { - 'master': ['localhost:{port}'.format(port=ports[0])], + 'main': ['localhost:{port}'.format(port=ports[0])], 'ps': ['localhost:{port}'.format(port=p) for p in ports[1:num_ps + 1]], 'worker': ['localhost:{port}'.format(port=p) for p in ports[num_ps + 1:]] } for task_type, addresses in cluster.items(): - if task_type != 'master': + if task_type != 'main': for i in range(len(addresses)): MakeProcess(module_name, package_root, @@ -135,6 +135,6 @@ def RunDistributed(module_name, return MakeProcess(module_name, package_root, args=user_args, - task_type='master', + task_type='main', index=0, cluster=cluster) diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/flags.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/flags.py index 7d88b295..82aeb0d7 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/flags.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/flags.py @@ -289,20 +289,20 @@ def AddEnableBinLog(parser, show_negated_in_help=False): **kwargs) -def AddExternalMasterGroup(parser): - """Add flags to the parser for creating an external master and replica.""" +def AddExternalMainGroup(parser): + """Add flags to the parser for creating an external main and replica.""" # Group for creating external primary instances. - external_master_group = parser.add_group( + external_main_group = parser.add_group( required=False, help='Options for creating a wrapper for an external data source.') - external_master_group.add_argument( + external_main_group.add_argument( '--source-ip-address', required=True, type=compute_utils.IPV4Argument, help=('Public IP address used to connect to and replicate from ' 'the external data source.')) - external_master_group.add_argument( + external_main_group.add_argument( '--source-port', type=arg_parsers.BoundedInt(lower_bound=1, upper_bound=65535), # Default MySQL port number. @@ -316,25 +316,25 @@ def AddExternalMasterGroup(parser): help=('Options for creating an internal replica of an external data ' 'source.')) internal_replica_group.add_argument( - '--master-username', + '--main-username', required=True, help='Name of the replication user on the external data source.') # TODO(b/78648703): Make group required when mutex required status is fixed. # For entering the password of the replication user of an external primary. - master_password_group = internal_replica_group.add_group( + main_password_group = internal_replica_group.add_group( 'Password group.', mutex=True) - master_password_group.add_argument( - '--master-password', + main_password_group.add_argument( + '--main-password', help='Password of the replication user on the external data source.') - master_password_group.add_argument( - '--prompt-for-master-password', + main_password_group.add_argument( + '--prompt-for-main-password', action='store_true', help=('Prompt for the password of the replication user on the ' 'external data source. The password is all typed characters up ' 'to but not including the RETURN or ENTER key.')) internal_replica_group.add_argument( - '--master-dump-file-path', + '--main-dump-file-path', required=True, type=storage_util.ObjectReference.FromArgument, help=('Path to the MySQL dump file in Google Cloud Storage from ' @@ -346,7 +346,7 @@ def AddExternalMasterGroup(parser): credential_group = internal_replica_group.add_group( 'Client and server credentials.', required=False) credential_group.add_argument( - '--master-ca-certificate-path', + '--main-ca-certificate-path', required=True, help=('Path to a file containing the X.509v3 (RFC5280) PEM encoded ' 'certificate of the CA that signed the external data source\'s ' diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/instances.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/instances.py index ea1cb186..95e4f382 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/instances.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/command_lib/sql/instances.py @@ -312,9 +312,9 @@ def ConstructCreateInstanceFromArgs(cls, instance_resource.region = reducers.Region(args.region, args.gce_zone) instance_resource.databaseVersion = args.database_version - instance_resource.masterInstanceName = args.master_instance_name + instance_resource.mainInstanceName = args.main_instance_name - # BETA: Set the host port and return early if external master instance. + # BETA: Set the host port and return early if external main instance. if _IsBetaOrNewer(release_track) and args.IsSpecified('source_ip_address'): on_premises_configuration = reducers.OnPremisesConfiguration( sql_messages, args.source_ip_address, args.source_port) @@ -324,7 +324,7 @@ def ConstructCreateInstanceFromArgs(cls, instance_resource.settings = cls._ConstructCreateSettingsFromArgs( sql_messages, args, original, release_track) - if args.master_instance_name: + if args.main_instance_name: replication = 'ASYNCHRONOUS' if args.replica_type == 'FAILOVER': instance_resource.replicaConfiguration = ( @@ -339,30 +339,30 @@ def ConstructCreateInstanceFromArgs(cls, sql_messages.DatabaseInstance.FailoverReplicaValue( name=args.failover_replica_name)) - # BETA: Config for creating a replica of an external master instance. - if _IsBetaOrNewer(release_track) and args.IsSpecified('master_username'): - # Ensure that the master instance name is specified. - if not args.IsSpecified('master_instance_name'): + # BETA: Config for creating a replica of an external main instance. + if _IsBetaOrNewer(release_track) and args.IsSpecified('main_username'): + # Ensure that the main instance name is specified. + if not args.IsSpecified('main_instance_name'): raise exceptions.RequiredArgumentException( - '--master-instance-name', 'To create a read replica of an external ' - 'master instance, [--master-instance-name] must be specified') + '--main-instance-name', 'To create a read replica of an external ' + 'main instance, [--main-instance-name] must be specified') # TODO(b/78648703): Remove when mutex required status is fixed. - # Ensure that the master replication user password is specified. - if not (args.IsSpecified('master_password') or - args.IsSpecified('prompt_for_master_password')): + # Ensure that the main replication user password is specified. + if not (args.IsSpecified('main_password') or + args.IsSpecified('prompt_for_main_password')): raise exceptions.RequiredArgumentException( - '--master-password', 'To create a read replica of an external ' - 'master instance, [--master-password] or ' - '[--prompt-for-master-password] must be specified') + '--main-password', 'To create a read replica of an external ' + 'main instance, [--main-password] or ' + '[--prompt-for-main-password] must be specified') # Get password if not specified on command line. - if args.prompt_for_master_password: - args.master_password = getpass.getpass('Master Instance Password: ') + if args.prompt_for_main_password: + args.main_password = getpass.getpass('Main Instance Password: ') instance_resource.replicaConfiguration = reducers.ReplicaConfiguration( - sql_messages, args.master_username, args.master_password, - args.master_dump_file_path, args.master_ca_certificate_path, + sql_messages, args.main_username, args.main_password, + args.main_dump_file_path, args.main_ca_certificate_path, args.client_certificate_path, args.client_key_path) return instance_resource diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py index 8c92ab0c..06b4ab66 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py @@ -819,7 +819,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py index 55e95c61..00e0ca6b 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py @@ -330,7 +330,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py index a4ca3dfe..27e2fe2b 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py @@ -819,7 +819,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py index 7f84b02a..5728321f 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py @@ -97,10 +97,10 @@ def Create(self, request, global_params=None): [billing subaccounts](https://cloud.google.com/billing/docs/concepts) by GCP resellers. When creating a subaccount, the current authenticated user must have the -`billing.accounts.update` IAM permission on the master account, which is +`billing.accounts.update` IAM permission on the main account, which is typically given to billing account [administrators](https://cloud.google.com/billing/docs/how-to/billing-access). -This method will return an error if the master account has not been +This method will return an error if the main account has not been provisioned as a reseller account. Args: diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py index aa82cc21..a7c02eac 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py @@ -132,9 +132,9 @@ class BillingAccount(_messages.Message): Fields: displayName: The display name given to the billing account, such as `My Billing Account`. This name is displayed in the GCP Console. - masterBillingAccount: If this account is a + mainBillingAccount: If this account is a [subaccount](https://cloud.google.com/billing/docs/concepts), then this - will be the resource name of the master billing account that it is being + will be the resource name of the main billing account that it is being resold through. Otherwise this will be empty. name: The resource name of the billing account. The resource name has the form `billingAccounts/{billing_account_id}`. For example, @@ -147,7 +147,7 @@ class BillingAccount(_messages.Message): """ displayName = _messages.StringField(1) - masterBillingAccount = _messages.StringField(2) + mainBillingAccount = _messages.StringField(2) name = _messages.StringField(3) open = _messages.BooleanField(4) @@ -227,7 +227,7 @@ class CloudbillingBillingAccountsListRequest(_messages.Message): this only supports filtering for [subaccounts](https://cloud.google.com/billing/docs/concepts) under a single provided reseller billing account. (e.g. - "master_billing_account=billingAccounts/012345-678901-ABCDEF"). Boolean + "main_billing_account=billingAccounts/012345-678901-ABCDEF"). Boolean algebra and other fields are not currently supported. pageSize: Requested page size. The maximum page size is 100; this is also the default. diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py index e86a8b6a..2fb498e3 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py @@ -825,7 +825,7 @@ class SourceRepository(_messages.Message): opers.google.com/projects/*/repos/*/revisions/*/paths/*` To refer to a moveable alias (branch): `https://source.developers.google.com/projects/*/repos/*/moveable- - aliases/*/paths/*` In particular, to refer to HEAD use `master` moveable + aliases/*/paths/*` In particular, to refer to HEAD use `main` moveable alias. To refer to a specific fixed alias (tag): `https://source.developers.google.com/projects/*/repos/*/fixed- aliases/*/paths/*` You may omit `paths/*` if you want to use the main diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py index 2361fa6e..2978276a 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py @@ -35,17 +35,17 @@ def __init__(self, url='', credentials=None, default_global_params=default_global_params, additional_http_headers=additional_http_headers, response_encoding=response_encoding) - self.masterProjects_locations_projects_clusters_master = self.MasterProjectsLocationsProjectsClustersMasterService(self) - self.masterProjects_locations_projects_clusters_namespaces = self.MasterProjectsLocationsProjectsClustersNamespacesService(self) - self.masterProjects_locations_projects_clusters = self.MasterProjectsLocationsProjectsClustersService(self) - self.masterProjects_locations_projects = self.MasterProjectsLocationsProjectsService(self) - self.masterProjects_locations_signedUrls = self.MasterProjectsLocationsSignedUrlsService(self) - self.masterProjects_locations_tokens = self.MasterProjectsLocationsTokensService(self) - self.masterProjects_locations = self.MasterProjectsLocationsService(self) - self.masterProjects_zones_signedUrls = self.MasterProjectsZonesSignedUrlsService(self) - self.masterProjects_zones_tokens = self.MasterProjectsZonesTokensService(self) - self.masterProjects_zones = self.MasterProjectsZonesService(self) - self.masterProjects = self.MasterProjectsService(self) + self.mainProjects_locations_projects_clusters_main = self.MainProjectsLocationsProjectsClustersMainService(self) + self.mainProjects_locations_projects_clusters_namespaces = self.MainProjectsLocationsProjectsClustersNamespacesService(self) + self.mainProjects_locations_projects_clusters = self.MainProjectsLocationsProjectsClustersService(self) + self.mainProjects_locations_projects = self.MainProjectsLocationsProjectsService(self) + self.mainProjects_locations_signedUrls = self.MainProjectsLocationsSignedUrlsService(self) + self.mainProjects_locations_tokens = self.MainProjectsLocationsTokensService(self) + self.mainProjects_locations = self.MainProjectsLocationsService(self) + self.mainProjects_zones_signedUrls = self.MainProjectsZonesSignedUrlsService(self) + self.mainProjects_zones_tokens = self.MainProjectsZonesTokensService(self) + self.mainProjects_zones = self.MainProjectsZonesService(self) + self.mainProjects = self.MainProjectsService(self) self.projects_locations_clusters_nodePools = self.ProjectsLocationsClustersNodePoolsService(self) self.projects_locations_clusters = self.ProjectsLocationsClustersService(self) self.projects_locations_operations = self.ProjectsLocationsOperationsService(self) @@ -56,22 +56,22 @@ def __init__(self, url='', credentials=None, self.projects_zones = self.ProjectsZonesService(self) self.projects = self.ProjectsService(self) - class MasterProjectsLocationsProjectsClustersMasterService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects_clusters_master resource.""" + class MainProjectsLocationsProjectsClustersMainService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects_clusters_main resource.""" - _NAME = u'masterProjects_locations_projects_clusters_master' + _NAME = u'mainProjects_locations_projects_clusters_main' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsClustersMasterService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsClustersMainService, self).__init__(client) self._upload_configs = { } def AckRepairwork(self, request, global_params=None): r"""AcknowledgeRepairWork accepts acknowledgements of repair work from the. -Hosted Master. +Hosted Main. Args: - request: (ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest) input message + request: (ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AckRepairWorkResponse) The response message. @@ -82,23 +82,23 @@ def AckRepairwork(self, request, global_params=None): AckRepairwork.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.projects.clusters.master.ackRepairwork', - ordered_params=[u'masterProjectName', u'location', u'projectNumber', u'clusterId', u'masterId'], - path_params=[u'clusterId', u'location', u'masterId', u'masterProjectName', u'projectNumber'], + method_id=u'container.mainProjects.locations.projects.clusters.main.ackRepairwork', + ordered_params=[u'mainProjectName', u'location', u'projectNumber', u'clusterId', u'mainId'], + path_params=[u'clusterId', u'location', u'mainId', u'mainProjectName', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/master/{masterId}/ackRepairwork', + relative_path=u'v1/mainProjects/{mainProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/main/{mainId}/ackRepairwork', request_field=u'ackRepairWorkRequest', - request_type_name=u'ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest', + request_type_name=u'ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest', response_type_name=u'AckRepairWorkResponse', supports_download=False, ) def GetRepairwork(self, request, global_params=None): r"""This method requests work from the API server to see if there are. -any repairs to be done on the Hosted Master. +any repairs to be done on the Hosted Main. Args: - request: (ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest) input message + request: (ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (GetRepairWorkResponse) The response message. @@ -109,24 +109,24 @@ def GetRepairwork(self, request, global_params=None): GetRepairwork.method_config = lambda: base_api.ApiMethodInfo( http_method=u'GET', - method_id=u'container.masterProjects.locations.projects.clusters.master.getRepairwork', - ordered_params=[u'masterProjectName', u'location', u'projectNumber', u'clusterId', u'masterId'], - path_params=[u'clusterId', u'location', u'masterId', u'masterProjectName', u'projectNumber'], + method_id=u'container.mainProjects.locations.projects.clusters.main.getRepairwork', + ordered_params=[u'mainProjectName', u'location', u'projectNumber', u'clusterId', u'mainId'], + path_params=[u'clusterId', u'location', u'mainId', u'mainProjectName', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/master/{masterId}/repairwork', + relative_path=u'v1/mainProjects/{mainProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/main/{mainId}/repairwork', request_field='', - request_type_name=u'ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest', + request_type_name=u'ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest', response_type_name=u'GetRepairWorkResponse', supports_download=False, ) - class MasterProjectsLocationsProjectsClustersNamespacesService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects_clusters_namespaces resource.""" + class MainProjectsLocationsProjectsClustersNamespacesService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects_clusters_namespaces resource.""" - _NAME = u'masterProjects_locations_projects_clusters_namespaces' + _NAME = u'mainProjects_locations_projects_clusters_namespaces' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsClustersNamespacesService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsClustersNamespacesService, self).__init__(client) self._upload_configs = { } @@ -135,7 +135,7 @@ def Finalize(self, request, global_params=None): now, this involved purging IAM policies. Args: - request: (ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest) input message + request: (ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Empty) The response message. @@ -146,54 +146,54 @@ def Finalize(self, request, global_params=None): Finalize.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.projects.clusters.namespaces.finalize', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId', u'namespaceId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'namespaceId', u'projectNumber'], + method_id=u'container.mainProjects.locations.projects.clusters.namespaces.finalize', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId', u'namespaceId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'namespaceId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/namespaces/{namespaceId}/finalize', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/namespaces/{namespaceId}/finalize', request_field='', - request_type_name=u'ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest', + request_type_name=u'ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest', response_type_name=u'Empty', supports_download=False, ) - class MasterProjectsLocationsProjectsClustersService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects_clusters resource.""" + class MainProjectsLocationsProjectsClustersService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects_clusters resource.""" - _NAME = u'masterProjects_locations_projects_clusters' + _NAME = u'mainProjects_locations_projects_clusters' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsClustersService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsClustersService, self).__init__(client) self._upload_configs = { } - class MasterProjectsLocationsProjectsService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects resource.""" + class MainProjectsLocationsProjectsService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects resource.""" - _NAME = u'masterProjects_locations_projects' + _NAME = u'mainProjects_locations_projects' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsService, self).__init__(client) self._upload_configs = { } - class MasterProjectsLocationsSignedUrlsService(base_api.BaseApiService): - """Service class for the masterProjects_locations_signedUrls resource.""" + class MainProjectsLocationsSignedUrlsService(base_api.BaseApiService): + """Service class for the mainProjects_locations_signedUrls resource.""" - _NAME = u'masterProjects_locations_signedUrls' + _NAME = u'mainProjects_locations_signedUrls' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsSignedUrlsService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsSignedUrlsService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates signed URLs that allow for writing a file to a private GCS bucket. -for storing backups of hosted master data. Signed URLs are explained here: +for storing backups of hosted main data. Signed URLs are explained here: https://cloud.google.com/storage/docs/access-control#Signed-URLs Args: - request: (ContainerMasterProjectsLocationsSignedUrlsCreateRequest) input message + request: (ContainerMainProjectsLocationsSignedUrlsCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (SignedUrls) The response message. @@ -204,34 +204,34 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.signedUrls.create', - ordered_params=[u'masterProjectId', u'location'], - path_params=[u'location', u'masterProjectId'], + method_id=u'container.mainProjects.locations.signedUrls.create', + ordered_params=[u'mainProjectId', u'location'], + path_params=[u'location', u'mainProjectId'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/signedUrls', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/signedUrls', request_field=u'createSignedUrlsRequest', - request_type_name=u'ContainerMasterProjectsLocationsSignedUrlsCreateRequest', + request_type_name=u'ContainerMainProjectsLocationsSignedUrlsCreateRequest', response_type_name=u'SignedUrls', supports_download=False, ) - class MasterProjectsLocationsTokensService(base_api.BaseApiService): - """Service class for the masterProjects_locations_tokens resource.""" + class MainProjectsLocationsTokensService(base_api.BaseApiService): + """Service class for the mainProjects_locations_tokens resource.""" - _NAME = u'masterProjects_locations_tokens' + _NAME = u'mainProjects_locations_tokens' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsTokensService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsTokensService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates a compute-read-write (https://www.googleapis.com/auth/compute). -scoped OAuth2 access token for , to allow a hosted master +scoped OAuth2 access token for , to allow a hosted main to make modifications to its user's project. Args: - request: (ContainerMasterProjectsLocationsTokensCreateRequest) input message + request: (ContainerMainProjectsLocationsTokensCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Token) The response message. @@ -242,24 +242,24 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.tokens.create', - ordered_params=[u'masterProjectId', u'location'], - path_params=[u'location', u'masterProjectId'], + method_id=u'container.mainProjects.locations.tokens.create', + ordered_params=[u'mainProjectId', u'location'], + path_params=[u'location', u'mainProjectId'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/tokens', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/tokens', request_field=u'createTokenRequest', - request_type_name=u'ContainerMasterProjectsLocationsTokensCreateRequest', + request_type_name=u'ContainerMainProjectsLocationsTokensCreateRequest', response_type_name=u'Token', supports_download=False, ) - class MasterProjectsLocationsService(base_api.BaseApiService): - """Service class for the masterProjects_locations resource.""" + class MainProjectsLocationsService(base_api.BaseApiService): + """Service class for the mainProjects_locations resource.""" - _NAME = u'masterProjects_locations' + _NAME = u'mainProjects_locations' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsService, self).__init__(client) self._upload_configs = { } @@ -268,7 +268,7 @@ def Audit(self, request, global_params=None): policies defined by GKE. Args: - request: (ContainerMasterProjectsLocationsAuditRequest) input message + request: (ContainerMainProjectsLocationsAuditRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuditResponse) The response message. @@ -279,13 +279,13 @@ def Audit(self, request, global_params=None): Audit.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.audit', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.audit', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/audit', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/audit', request_field=u'auditEventList', - request_type_name=u'ContainerMasterProjectsLocationsAuditRequest', + request_type_name=u'ContainerMainProjectsLocationsAuditRequest', response_type_name=u'AuditResponse', supports_download=False, ) @@ -300,7 +300,7 @@ def Authenticate(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authentication.k8s.io/v1beta1/types.go. Args: - request: (ContainerMasterProjectsLocationsAuthenticateRequest) input message + request: (ContainerMainProjectsLocationsAuthenticateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthenticateResponse) The response message. @@ -311,13 +311,13 @@ def Authenticate(self, request, global_params=None): Authenticate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.authenticate', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.authenticate', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/authenticate', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/authenticate', request_field=u'authenticateRequest', - request_type_name=u'ContainerMasterProjectsLocationsAuthenticateRequest', + request_type_name=u'ContainerMainProjectsLocationsAuthenticateRequest', response_type_name=u'AuthenticateResponse', supports_download=False, ) @@ -332,7 +332,7 @@ def Authorize(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authorization/v1beta1/types.go. Args: - request: (ContainerMasterProjectsLocationsAuthorizeRequest) input message + request: (ContainerMainProjectsLocationsAuthorizeRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthorizeResponse) The response message. @@ -343,13 +343,13 @@ def Authorize(self, request, global_params=None): Authorize.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.authorize', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.authorize', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/authorize', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/authorize', request_field=u'authorizeRequest', - request_type_name=u'ContainerMasterProjectsLocationsAuthorizeRequest', + request_type_name=u'ContainerMainProjectsLocationsAuthorizeRequest', response_type_name=u'AuthorizeResponse', supports_download=False, ) @@ -363,7 +363,7 @@ def Imagereview(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/imagepolicy/v1beta1/types.go. Args: - request: (ContainerMasterProjectsLocationsImagereviewRequest) input message + request: (ContainerMainProjectsLocationsImagereviewRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (ImageReviewResponse) The response message. @@ -374,13 +374,13 @@ def Imagereview(self, request, global_params=None): Imagereview.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.imagereview', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.imagereview', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/imagereview', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/imagereview', request_field=u'imageReviewRequest', - request_type_name=u'ContainerMasterProjectsLocationsImagereviewRequest', + request_type_name=u'ContainerMainProjectsLocationsImagereviewRequest', response_type_name=u'ImageReviewResponse', supports_download=False, ) @@ -401,34 +401,34 @@ def Signcertificate(self, request, global_params=None): Signcertificate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.signcertificate', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.signcertificate', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/signcertificate', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/signcertificate', request_field='', request_type_name=u'CertificateSigningRequest', response_type_name=u'CertificateSigningRequest', supports_download=False, ) - class MasterProjectsZonesSignedUrlsService(base_api.BaseApiService): - """Service class for the masterProjects_zones_signedUrls resource.""" + class MainProjectsZonesSignedUrlsService(base_api.BaseApiService): + """Service class for the mainProjects_zones_signedUrls resource.""" - _NAME = u'masterProjects_zones_signedUrls' + _NAME = u'mainProjects_zones_signedUrls' def __init__(self, client): - super(ContainerV1.MasterProjectsZonesSignedUrlsService, self).__init__(client) + super(ContainerV1.MainProjectsZonesSignedUrlsService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates signed URLs that allow for writing a file to a private GCS bucket. -for storing backups of hosted master data. Signed URLs are explained here: +for storing backups of hosted main data. Signed URLs are explained here: https://cloud.google.com/storage/docs/access-control#Signed-URLs Args: - request: (ContainerMasterProjectsZonesSignedUrlsCreateRequest) input message + request: (ContainerMainProjectsZonesSignedUrlsCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (SignedUrls) The response message. @@ -439,34 +439,34 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.signedUrls.create', - ordered_params=[u'masterProjectId', u'zone'], - path_params=[u'masterProjectId', u'zone'], + method_id=u'container.mainProjects.zones.signedUrls.create', + ordered_params=[u'mainProjectId', u'zone'], + path_params=[u'mainProjectId', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/signedUrls', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/signedUrls', request_field=u'createSignedUrlsRequest', - request_type_name=u'ContainerMasterProjectsZonesSignedUrlsCreateRequest', + request_type_name=u'ContainerMainProjectsZonesSignedUrlsCreateRequest', response_type_name=u'SignedUrls', supports_download=False, ) - class MasterProjectsZonesTokensService(base_api.BaseApiService): - """Service class for the masterProjects_zones_tokens resource.""" + class MainProjectsZonesTokensService(base_api.BaseApiService): + """Service class for the mainProjects_zones_tokens resource.""" - _NAME = u'masterProjects_zones_tokens' + _NAME = u'mainProjects_zones_tokens' def __init__(self, client): - super(ContainerV1.MasterProjectsZonesTokensService, self).__init__(client) + super(ContainerV1.MainProjectsZonesTokensService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates a compute-read-write (https://www.googleapis.com/auth/compute). -scoped OAuth2 access token for , to allow a hosted master +scoped OAuth2 access token for , to allow a hosted main to make modifications to its user's project. Args: - request: (ContainerMasterProjectsZonesTokensCreateRequest) input message + request: (ContainerMainProjectsZonesTokensCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Token) The response message. @@ -477,24 +477,24 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.tokens.create', - ordered_params=[u'masterProjectId', u'zone'], - path_params=[u'masterProjectId', u'zone'], + method_id=u'container.mainProjects.zones.tokens.create', + ordered_params=[u'mainProjectId', u'zone'], + path_params=[u'mainProjectId', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/tokens', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/tokens', request_field=u'createTokenRequest', - request_type_name=u'ContainerMasterProjectsZonesTokensCreateRequest', + request_type_name=u'ContainerMainProjectsZonesTokensCreateRequest', response_type_name=u'Token', supports_download=False, ) - class MasterProjectsZonesService(base_api.BaseApiService): - """Service class for the masterProjects_zones resource.""" + class MainProjectsZonesService(base_api.BaseApiService): + """Service class for the mainProjects_zones resource.""" - _NAME = u'masterProjects_zones' + _NAME = u'mainProjects_zones' def __init__(self, client): - super(ContainerV1.MasterProjectsZonesService, self).__init__(client) + super(ContainerV1.MainProjectsZonesService, self).__init__(client) self._upload_configs = { } @@ -503,7 +503,7 @@ def Audit(self, request, global_params=None): policies defined by GKE. Args: - request: (ContainerMasterProjectsZonesAuditRequest) input message + request: (ContainerMainProjectsZonesAuditRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuditResponse) The response message. @@ -514,13 +514,13 @@ def Audit(self, request, global_params=None): Audit.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.audit', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.audit', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/audit', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/audit', request_field=u'auditEventList', - request_type_name=u'ContainerMasterProjectsZonesAuditRequest', + request_type_name=u'ContainerMainProjectsZonesAuditRequest', response_type_name=u'AuditResponse', supports_download=False, ) @@ -535,7 +535,7 @@ def Authenticate(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authentication.k8s.io/v1beta1/types.go. Args: - request: (ContainerMasterProjectsZonesAuthenticateRequest) input message + request: (ContainerMainProjectsZonesAuthenticateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthenticateResponse) The response message. @@ -546,13 +546,13 @@ def Authenticate(self, request, global_params=None): Authenticate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.authenticate', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.authenticate', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authenticate', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authenticate', request_field=u'authenticateRequest', - request_type_name=u'ContainerMasterProjectsZonesAuthenticateRequest', + request_type_name=u'ContainerMainProjectsZonesAuthenticateRequest', response_type_name=u'AuthenticateResponse', supports_download=False, ) @@ -567,7 +567,7 @@ def Authorize(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authorization/v1beta1/types.go. Args: - request: (ContainerMasterProjectsZonesAuthorizeRequest) input message + request: (ContainerMainProjectsZonesAuthorizeRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthorizeResponse) The response message. @@ -578,13 +578,13 @@ def Authorize(self, request, global_params=None): Authorize.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.authorize', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.authorize', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authorize', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authorize', request_field=u'authorizeRequest', - request_type_name=u'ContainerMasterProjectsZonesAuthorizeRequest', + request_type_name=u'ContainerMainProjectsZonesAuthorizeRequest', response_type_name=u'AuthorizeResponse', supports_download=False, ) @@ -598,7 +598,7 @@ def Imagereview(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/imagepolicy/v1beta1/types.go. Args: - request: (ContainerMasterProjectsZonesImagereviewRequest) input message + request: (ContainerMainProjectsZonesImagereviewRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (ImageReviewResponse) The response message. @@ -609,13 +609,13 @@ def Imagereview(self, request, global_params=None): Imagereview.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.imagereview', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.imagereview', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/imagereview', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/imagereview', request_field=u'imageReviewRequest', - request_type_name=u'ContainerMasterProjectsZonesImagereviewRequest', + request_type_name=u'ContainerMainProjectsZonesImagereviewRequest', response_type_name=u'ImageReviewResponse', supports_download=False, ) @@ -636,24 +636,24 @@ def Signcertificate(self, request, global_params=None): Signcertificate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.signcertificate', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.signcertificate', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/signcertificate', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/signcertificate', request_field='', request_type_name=u'CertificateSigningRequest', response_type_name=u'CertificateSigningRequest', supports_download=False, ) - class MasterProjectsService(base_api.BaseApiService): - """Service class for the masterProjects resource.""" + class MainProjectsService(base_api.BaseApiService): + """Service class for the mainProjects resource.""" - _NAME = u'masterProjects' + _NAME = u'mainProjects' def __init__(self, client): - super(ContainerV1.MasterProjectsService, self).__init__(client) + super(ContainerV1.MainProjectsService, self).__init__(client) self._upload_configs = { } @@ -922,7 +922,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1212,31 +1212,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set the password. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1/{+name}:setMasterAuth', + relative_path=u'v1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1323,7 +1323,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -1376,29 +1376,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1/{+name}:updateMaster', + relative_path=u'v1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1813,7 +1813,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -2041,28 +2041,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -2145,30 +2145,30 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set the password. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -2200,7 +2200,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py index ec8f85d1..10d24a9f 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py @@ -28,7 +28,7 @@ class AcceleratorConfig(_messages.Message): class AckRepairWorkRequest(_messages.Message): - r"""HostedMaster sends Acknowledgment of repair work once it is received. + r"""HostedMain sends Acknowledgment of repair work once it is received. Fields: hasFailed: Whether the operation has failed. @@ -60,7 +60,7 @@ class AddonsConfig(_messages.Message): services in a cluster. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. """ @@ -238,8 +238,8 @@ class AuditEventList(_messages.Message): Fields: items: The list of events to audit log. - location: The location of this master's cluster. - zone: The zone of this master's cluster. This field is deprecated. Use + location: The location of this main's cluster. + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -251,7 +251,7 @@ class AuditEventList(_messages.Message): class AuditObjectReference(_messages.Message): r"""AuditObjectReference contains enough information to let you inspect or modify the referred object. Should match ObjectReference in https://github. - com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apiserver/pkg/apis/ + com/kubernetes/kubernetes/blob/main/staging/src/k8s.io/apiserver/pkg/apis/ audit/v1beta1/generated.proto. Fields: @@ -282,7 +282,7 @@ class AuditResponse(_messages.Message): class AuthenticateRequest(_messages.Message): r"""A request to authenticate a user based on a provided OAuth2 token. This should look very close to the TokenReview struct in http://github.com/kubern - etes/kubernetes/blob/master/pkg/apis/authentication.k8s.io/v1beta1/types.go. + etes/kubernetes/blob/main/pkg/apis/authentication.k8s.io/v1beta1/types.go. This message has 4 GKE-specific fields that get mapped from the path, but the other fields (the expected JSON payload) must match TokenReview. @@ -290,13 +290,13 @@ class AuthenticateRequest(_messages.Message): apiVersion: The api version of the TokenReview object. kind: Fields from "pkg/apis/authentication.k8s.io/v1beta1".TokenReview: The "kind" of the TokenReview object. - location: The location of this master's cluster. + location: The location of this main's cluster. spec: The information about the request being evaluated. It contains the token that the server should authenticate. status: The response for the provided request. (this won't be filled in for an AuthenticateRequest, but it is part of the struct, so we need it here to be safe). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -311,7 +311,7 @@ class AuthenticateRequest(_messages.Message): class AuthenticateResponse(_messages.Message): r"""A response with the authenticated identity. This should match exactly with the TokenReview struct from http://github.com/kubernetes/kubernetes/blo - b/master/pkg/apis/authentication.k8s.io/types.go. + b/main/pkg/apis/authentication.k8s.io/types.go. Fields: apiVersion: The api version of the TokenReview object. @@ -385,7 +385,7 @@ class AuthorizeRequest(_messages.Message): attributes of the action the user is attempting. These attributes are mapped to a GKE IAM permission and policy to check. This should look very close to the SubjectAccessReview struct in http://github.com/kubernetes/kubernetes/bl - ob/master/pkg/apis/authorization/v1beta1/types.go. This message has 4 GKE- + ob/main/pkg/apis/authorization/v1beta1/types.go. This message has 4 GKE- specific fields that get mapped from the path, but the other fields (the expected JSON payload) must match SubjectAccessReview. @@ -393,12 +393,12 @@ class AuthorizeRequest(_messages.Message): apiVersion: The api version of the SubjectAccessReview object. kind: Fields from "pkg/apis/authorization/v1beta1".SubjectAccessReview: The "kind" of the SubjectAccessReview object. - location: The location of this master's cluster. + location: The location of this main's cluster. spec: The information about the user action being evaluated. status: The response for the provided request (this won't be filled in for an AuthorizeRequest, but it is part of the struct, so we need it here to be safe). - zone: The zone of this master's cluster. + zone: The zone of this main's cluster. """ apiVersion = _messages.StringField(1) @@ -412,7 +412,7 @@ class AuthorizeRequest(_messages.Message): class AuthorizeResponse(_messages.Message): r"""A response to a request for authorization. This should match exactly with the SubjectAccessReview struct from http://github.com/kubernetes/kubern - etes/blob/master/pkg/apis/v1beta1/authorization/types.go. + etes/blob/main/pkg/apis/v1beta1/authorization/types.go. Fields: apiVersion: The api version of the SubjectAccessReview object. @@ -492,21 +492,21 @@ class CertificateSigningRequest(_messages.Message): Fields: apiVersion: The api version of the CertificateSigningRequest object. - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. kind: The "kind" of the CertificateSigningRequest object. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the certificate is being - signed. This is the project in which this master's cluster resides. + signed. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. spec: The specification holds information about the certificate requesting to be signed. status: The status is populated at response time, and holds information about the success or failure of the operation along with the signed certificate. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -514,7 +514,7 @@ class CertificateSigningRequest(_messages.Message): clusterId = _messages.StringField(2) kind = _messages.StringField(3) location = _messages.StringField(4) - masterProjectId = _messages.StringField(5) + mainProjectId = _messages.StringField(5) projectNumber = _messages.IntegerField(6) spec = _messages.MessageField('CertificateSigningRequestSpec', 7) status = _messages.MessageField('CertificateSigningRequestStatus', 8) @@ -629,8 +629,8 @@ class Cluster(_messages.Message): automatically chosen or specify a `/14` block in `10.0.0.0/8`. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. currentNodeVersion: [Output only] The current version of the node software @@ -640,20 +640,20 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1alpha1) and features - that may not be production ready in the kubernetes version of the master - and nodes. The cluster has no SLA for uptime and master/node upgrades + that may not be production ready in the kubernetes version of the main + and nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -685,12 +685,12 @@ class Cluster(_messages.Message): cluster. * if left as an empty string,`logging.googleapis.com` will be used. maintenancePolicy: Configure the maintenance policy for this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. - masterAuthorizedNetworks: The configuration options for master authorized + mainAuthorizedNetworks: The configuration options for main authorized networks feature. This field is deprecated, use - master_authorized_networks_config instead. - masterAuthorizedNetworksConfig: The configuration options for master + main_authorized_networks_config instead. + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - @@ -746,7 +746,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -793,7 +793,7 @@ class AdditionalProperty(_messages.Message): auditConfig = _messages.MessageField('AuditConfig', 2) clusterIpv4Cidr = _messages.StringField(3) createTime = _messages.StringField(4) - currentMasterVersion = _messages.StringField(5) + currentMainVersion = _messages.StringField(5) currentNodeCount = _messages.IntegerField(6, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(7) description = _messages.StringField(8) @@ -810,9 +810,9 @@ class AdditionalProperty(_messages.Message): locations = _messages.StringField(19, repeated=True) loggingService = _messages.StringField(20) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 21) - masterAuth = _messages.MessageField('MasterAuth', 22) - masterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 23) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 24) + mainAuth = _messages.MessageField('MainAuth', 22) + mainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 23) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 24) monitoringService = _messages.StringField(25) name = _messages.StringField(26) network = _messages.StringField(27) @@ -896,18 +896,18 @@ class ClusterUpdate(_messages.Message): nodes being either created or removed from the cluster, depending on whether locations are being added or removed. This list must always include the cluster's primary zone. - desiredMasterAuthorizedNetworks: The desired configuration options for - master authorized networks feature. This field is deprecated, use - desired_master_authorized_networks_config instead. - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterId: An id of master replica to be updated. Can be set only - when desired_master_version is set. If not set, all replicas will be + desiredMainAuthorizedNetworks: The desired configuration options for + main authorized networks feature. This field is deprecated, use + desired_main_authorized_networks_config instead. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainId: An id of main replica to be updated. Can be set only + when desired_main_version is set. If not set, all replicas will be updated. - desiredMasterMachineType: The name of a Google Compute Engine [machine + desiredMainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - desiredMasterVersion: The Kubernetes version to change the master to. + main to. + desiredMainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest @@ -933,7 +933,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version """ desiredAddonsConfig = _messages.MessageField('AddonsConfig', 1) @@ -943,11 +943,11 @@ class ClusterUpdate(_messages.Message): desiredImageProject = _messages.StringField(5) desiredImageType = _messages.StringField(6) desiredLocations = _messages.StringField(7, repeated=True) - desiredMasterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 8) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 9) - desiredMasterId = _messages.StringField(10) - desiredMasterMachineType = _messages.StringField(11) - desiredMasterVersion = _messages.StringField(12) + desiredMainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 8) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 9) + desiredMainId = _messages.StringField(10) + desiredMainMachineType = _messages.StringField(11) + desiredMainVersion = _messages.StringField(12) desiredMonitoringService = _messages.StringField(13) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 14) desiredNodePoolId = _messages.StringField(15) @@ -970,7 +970,7 @@ class ClusterUpdateOptions(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -996,327 +996,327 @@ class CompleteIPRotationRequest(_messages.Message): zone = _messages.StringField(5) -class ContainerMasterProjectsLocationsAuditRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsAuditRequest object. +class ContainerMainProjectsLocationsAuditRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsAuditRequest object. Fields: auditEventList: A AuditEventList resource to be passed as the request body. - clusterId: The name of this master's cluster. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. """ auditEventList = _messages.MessageField('AuditEventList', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsAuthenticateRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsAuthenticateRequest object. +class ContainerMainProjectsLocationsAuthenticateRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsAuthenticateRequest object. Fields: authenticateRequest: A AuthenticateRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the signed URLs are being - requested. This is the project in which this master's cluster resides. + requested. This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. """ authenticateRequest = _messages.MessageField('AuthenticateRequest', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsAuthorizeRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsAuthorizeRequest object. +class ContainerMainProjectsLocationsAuthorizeRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsAuthorizeRequest object. Fields: authorizeRequest: A AuthorizeRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: This field is deprecated. Use location instead. The project number for which the request is being authorized. This is the project - in which this master's cluster resides. This is an int64, so it must be + in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. """ authorizeRequest = _messages.MessageField('AuthorizeRequest', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsImagereviewRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsImagereviewRequest object. +class ContainerMainProjectsLocationsImagereviewRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsImagereviewRequest object. Fields: - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. imageReviewRequest: A ImageReviewRequest resource to be passed as the request body. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. """ clusterId = _messages.StringField(1, required=True) imageReviewRequest = _messages.MessageField('ImageReviewRequest', 2) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest(_messages.Message): +class ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest(_messages.Message): r"""A - ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest + ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest object. Fields: ackRepairWorkRequest: A AckRepairWorkRequest resource to be passed as the request body. - clusterId: Cluster name of the cluster this master manages. - location: Location of the hosted master. - masterId: Master ID of the cluster master, unique identifier. - masterProjectName: Project Name of the Hosted Master Project. - projectNumber: Project number of the cluster this master manages. + clusterId: Cluster name of the cluster this main manages. + location: Location of the hosted main. + mainId: Main ID of the cluster main, unique identifier. + mainProjectName: Project Name of the Hosted Main Project. + projectNumber: Project number of the cluster this main manages. """ ackRepairWorkRequest = _messages.MessageField('AckRepairWorkRequest', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterId = _messages.StringField(4, required=True) - masterProjectName = _messages.StringField(5, required=True) + mainId = _messages.StringField(4, required=True) + mainProjectName = _messages.StringField(5, required=True) projectNumber = _messages.IntegerField(6, required=True) -class ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest(_messages.Message): +class ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest(_messages.Message): r"""A - ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest + ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest object. Fields: - clusterId: Cluster name of the cluster this master manages. - location: Location of the hosted master. - masterId: Master ID of the cluster master, unique identifier. - masterProjectName: Project Name of the Hosted Master Project. - projectNumber: Project number of the cluster this master manages. + clusterId: Cluster name of the cluster this main manages. + location: Location of the hosted main. + mainId: Main ID of the cluster main, unique identifier. + mainProjectName: Project Name of the Hosted Main Project. + projectNumber: Project number of the cluster this main manages. """ clusterId = _messages.StringField(1, required=True) location = _messages.StringField(2, required=True) - masterId = _messages.StringField(3, required=True) - masterProjectName = _messages.StringField(4, required=True) + mainId = _messages.StringField(3, required=True) + mainProjectName = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest(_messages.Message): +class ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest(_messages.Message): r"""A - ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest + ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest object. Fields: - clusterId: Cluster name of the cluster this master manages. - location: Location of the hosted master. - masterProjectId: The hosted master project in which this master resides. + clusterId: Cluster name of the cluster this main manages. + location: Location of the hosted main. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). namespaceId: Namespace name (not uuid). - projectNumber: Project number of the cluster this master manages. + projectNumber: Project number of the cluster this main manages. """ clusterId = _messages.StringField(1, required=True) location = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) namespaceId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsSignedUrlsCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsSignedUrlsCreateRequest object. +class ContainerMainProjectsLocationsSignedUrlsCreateRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsSignedUrlsCreateRequest object. Fields: createSignedUrlsRequest: A CreateSignedUrlsRequest resource to be passed as the request body. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). """ createSignedUrlsRequest = _messages.MessageField('CreateSignedUrlsRequest', 1) location = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) -class ContainerMasterProjectsLocationsTokensCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsTokensCreateRequest object. +class ContainerMainProjectsLocationsTokensCreateRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsTokensCreateRequest object. Fields: createTokenRequest: A CreateTokenRequest resource to be passed as the request body. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). """ createTokenRequest = _messages.MessageField('CreateTokenRequest', 1) location = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) -class ContainerMasterProjectsZonesAuditRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesAuditRequest object. +class ContainerMainProjectsZonesAuditRequest(_messages.Message): + r"""A ContainerMainProjectsZonesAuditRequest object. Fields: auditEventList: A AuditEventList resource to be passed as the request body. - clusterId: The name of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ auditEventList = _messages.MessageField('AuditEventList', 1) clusterId = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesAuthenticateRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesAuthenticateRequest object. +class ContainerMainProjectsZonesAuthenticateRequest(_messages.Message): + r"""A ContainerMainProjectsZonesAuthenticateRequest object. Fields: authenticateRequest: A AuthenticateRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the signed URLs are being - requested. This is the project in which this master's cluster resides. + requested. This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ authenticateRequest = _messages.MessageField('AuthenticateRequest', 1) clusterId = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesAuthorizeRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesAuthorizeRequest object. +class ContainerMainProjectsZonesAuthorizeRequest(_messages.Message): + r"""A ContainerMainProjectsZonesAuthorizeRequest object. Fields: authorizeRequest: A AuthorizeRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: This field is deprecated. Use location instead. The project number for which the request is being authorized. This is the project - in which this master's cluster resides. This is an int64, so it must be + in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. - zone: The zone of this master's cluster. + zone: The zone of this main's cluster. """ authorizeRequest = _messages.MessageField('AuthorizeRequest', 1) clusterId = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesImagereviewRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesImagereviewRequest object. +class ContainerMainProjectsZonesImagereviewRequest(_messages.Message): + r"""A ContainerMainProjectsZonesImagereviewRequest object. Fields: - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. imageReviewRequest: A ImageReviewRequest resource to be passed as the request body. - masterProjectId: The hosted master project in which this master resides. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ clusterId = _messages.StringField(1, required=True) imageReviewRequest = _messages.MessageField('ImageReviewRequest', 2) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesSignedUrlsCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesSignedUrlsCreateRequest object. +class ContainerMainProjectsZonesSignedUrlsCreateRequest(_messages.Message): + r"""A ContainerMainProjectsZonesSignedUrlsCreateRequest object. Fields: createSignedUrlsRequest: A CreateSignedUrlsRequest resource to be passed as the request body. - masterProjectId: The hosted master project in which this master resides. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ createSignedUrlsRequest = _messages.MessageField('CreateSignedUrlsRequest', 1) - masterProjectId = _messages.StringField(2, required=True) + mainProjectId = _messages.StringField(2, required=True) zone = _messages.StringField(3, required=True) -class ContainerMasterProjectsZonesTokensCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesTokensCreateRequest object. +class ContainerMainProjectsZonesTokensCreateRequest(_messages.Message): + r"""A ContainerMainProjectsZonesTokensCreateRequest object. Fields: createTokenRequest: A CreateTokenRequest resource to be passed as the request body. - masterProjectId: The hosted master project in which this master resides. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ createTokenRequest = _messages.MessageField('CreateTokenRequest', 1) - masterProjectId = _messages.StringField(2, required=True) + mainProjectId = _messages.StringField(2, required=True) zone = _messages.StringField(3, required=True) @@ -1820,17 +1820,17 @@ class CreateNodePoolRequest(_messages.Message): class CreateSignedUrlsRequest(_messages.Message): r"""A request for signed URLs that allow for writing a file to a private GCS - bucket for storing backups of hosted master data. + bucket for storing backups of hosted main data. Fields: - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. filenames: The names of the files for which a signed URLs are being requested. - location: The location of this master's cluster. + location: The location of this main's cluster. projectNumber: The project number for which the signed URLs are being - requested. This is the project in which this master's cluster resides. + requested. This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -1844,16 +1844,16 @@ class CreateSignedUrlsRequest(_messages.Message): class CreateTokenRequest(_messages.Message): r"""A request for a compute-read-write (https://www.googleapis.com/auth/compute) scoped OAuth2 access token for - , to allow hosted masters to make modifications to a user's + , to allow hosted mains to make modifications to a user's project. Fields: - clusterId: The name of this master's cluster. - location: The location of this master's cluster. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. projectNumber: The project number for which the access is being requested. - This is the project in which this master's cluster resides. Note that + This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -1908,28 +1908,28 @@ class Empty(_messages.Message): class GetRepairWorkResponse(_messages.Message): - r"""Response sent back to the Hosted Master detailing if there is work, and + r"""Response sent back to the Hosted Main detailing if there is work, and if so, what kind of work to do. Enums: - RepairTypeValueValuesEnum: The type of repair for this master. + RepairTypeValueValuesEnum: The type of repair for this main. Fields: clearEventEtcdDetails: clear_event_etcd_details token to be used when clearing event etcd. Required for CLEAR_EVENT_ETCD repair. repairId: Repair ID of the returned repair. - repairType: The type of repair for this master. + repairType: The type of repair for this main. restoreEtcdDetails: restore_etcd_details describes what backup should be used in RESTORE_ETCD. Required for repair_type = RESTORE_ETCD. """ class RepairTypeValueValuesEnum(_messages.Enum): - r"""The type of repair for this master. + r"""The type of repair for this main. Values: UNKNOWN: Unknown Repair Type. REBOOT: A VM Reboot is required. - IN_PLACE: An in place master repair is required. + IN_PLACE: An in place main repair is required. NONE: No Repair is required RESTORE_ETCD: Restore etcd from backup. CLEAR_EVENT_ETCD: Clear event etcd. @@ -2054,7 +2054,7 @@ class ImageReviewRequest(_messages.Message): r"""A request to verify an image. The request contains the attributes of the container to create. These are passed to BCID for verification. This should look very close to the ImageReview struct in http://github.com/kubernetes/ku - bernetes/blob/master/pkg/apis/imagepolicy/v1beta1/types.go. This message has + bernetes/blob/main/pkg/apis/imagepolicy/v1beta1/types.go. This message has 4 GKE-specific fields that get mapped from the path, but the other fields (the expected JSON payload) must match ImageReview. @@ -2062,12 +2062,12 @@ class ImageReviewRequest(_messages.Message): apiVersion: The api version of the SubjectAccessReview object. kind: Fields from "pkg/apis/authorization/v1beta1".SubjectAccessReview: The "kind" of the SubjectAccessReview object. - location: The location of this master's cluster. + location: The location of this main's cluster. spec: The information about the user action being evaluated. status: The response for the provided request (this won't be filled in for an AuthorizeRequest, but it is part of the struct, so we need it here to be safe). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -2082,7 +2082,7 @@ class ImageReviewRequest(_messages.Message): class ImageReviewResponse(_messages.Message): r"""A response to a request for image verification. This should match exactly with the ImageReview struct from http://github.com/kubernetes/kubern - etes/blob/master/pkg/apis/v1beta1/authorization/types.go. + etes/blob/main/pkg/apis/v1beta1/authorization/types.go. Fields: apiVersion: The api version of the ImageReview object. @@ -2255,8 +2255,8 @@ class MaintenanceWindow(_messages.Message): dailyMaintenanceWindow = _messages.MessageField('DailyMaintenanceWindow', 1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -2270,11 +2270,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, you can disable basic authentication by providing an empty username. """ @@ -2287,33 +2287,33 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworks(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworks(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. This message - is deprecated, use MasterAuthorizedNetworksConfig instead. + is deprecated, use MainAuthorizedNetworksConfig instead. Fields: cidrs: Network CIDRs define up to 10 external networks that could access - Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrs = _messages.MessageField('CIDR', 1, repeated=True) enabled = _messages.BooleanField(2) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -2323,7 +2323,7 @@ class MasterAuthorizedNetworksConfig(_messages.Message): class MetaV1Status(_messages.Message): r"""MetaV1Status is a return value for calls that don't return other objects. Should match Status in https://github.com/kubernetes/kubernetes/bl - ob/master/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto. + ob/main/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto. Fields: code: Suggested HTTP return code for this status, 0 if not set. +optional @@ -2363,7 +2363,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -2579,7 +2579,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2717,7 +2717,7 @@ class ObjectMeta(_messages.Message): r"""ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create. Only one field is used from this proto in AuditEvent. Should match ObjectMeta in https://github.com/kubernet - es/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/g + es/kubernetes/blob/main/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/g enerated.proto Fields: @@ -2770,7 +2770,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2780,7 +2780,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2909,7 +2909,7 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ @@ -2917,7 +2917,7 @@ class ServerConfig(_messages.Message): defaultClusterVersion = _messages.StringField(2) defaultImageType = _messages.StringField(3) validImageTypes = _messages.StringField(4, repeated=True) - validMasterVersions = _messages.StringField(5, repeated=True) + validMainVersions = _messages.StringField(5, repeated=True) validNodeVersions = _messages.StringField(6, repeated=True) @@ -3125,15 +3125,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(6) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -3149,7 +3149,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -3169,7 +3169,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) version = _messages.StringField(6) zone = _messages.StringField(7) @@ -3325,7 +3325,7 @@ class SetNodePoolSizeRequest(_messages.Message): class SignedUrls(_messages.Message): r"""Signed URLs that allow for writing a file to a private GCS bucket for - storing backups of hosted master data. + storing backups of hosted main data. Fields: signedUrls: The signed URLs for writing the request files, in the same @@ -3539,7 +3539,7 @@ class SubjectAccessReviewStatus(_messages.Message): class Token(_messages.Message): r"""A compute-read-write (https://www.googleapis.com/auth/compute) scoped - OAuth2 access token, to allow hosted masters to make modifications to a + OAuth2 access token, to allow hosted mains to make modifications to a user's project. Fields: @@ -3604,16 +3604,16 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(7) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterMachineType: The name of a Google Compute Engine [machine + mainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - masterVersion: The Kubernetes version to change the master to. Users may + main to. + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -3632,8 +3632,8 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterMachineType = _messages.StringField(2) - masterVersion = _messages.StringField(3) + mainMachineType = _messages.StringField(2) + mainVersion = _messages.StringField(3) name = _messages.StringField(4) projectId = _messages.StringField(5) version = _messages.StringField(6) @@ -3662,7 +3662,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py index c069ffe1..f2ec6fb0 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py @@ -359,7 +359,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -649,32 +649,32 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1alpha1/{+name}:setMasterAuth', + relative_path=u'v1alpha1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -761,7 +761,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -814,29 +814,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1alpha1/{+name}:updateMaster', + relative_path=u'v1alpha1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1278,7 +1278,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1506,28 +1506,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1610,31 +1610,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1666,7 +1666,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py index d0d2d866..44bad32a 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py @@ -42,7 +42,7 @@ class AddonsConfig(_messages.Message): and secure microservices. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. serverlessConfig: Configuration for the serverless addon. The `IstioConfig` addon must be enabled in order to enable serverless. This @@ -234,8 +234,8 @@ class Cluster(_messages.Message): conditions: Which conditions caused the current cluster state. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. currentNodeVersion: [Output only] The current version of the node software @@ -251,24 +251,24 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1alpha1) and features - that may not be production ready in the kubernetes version of the master - and nodes. The cluster has no SLA for uptime and master/node upgrades + that may not be production ready in the kubernetes version of the main + and nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. enableNamespaceLevelIam: If this cluster supports namespace-level IAM policies. Clusters that support namespace-level IAM may have IAM policies set on their namespaces using SetIamPolicy. enableTpu: Enable the ability to use Cloud TPUs in this cluster. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -302,16 +302,16 @@ class Cluster(_messages.Message): maintenancePolicy: Configure the maintenance policy for this cluster. managedPodIdentityConfig: Configuration for the use of GCP IAM Service Accounts in applications in this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. - masterAuthorizedNetworks: The configuration options for master authorized + mainAuthorizedNetworks: The configuration options for main authorized networks feature. This field is deprecated, use - master_authorized_networks_config instead. - masterAuthorizedNetworksConfig: The configuration options for master + main_authorized_networks_config instead. + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. - masterIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted - master network. This prefix will be used for assigning private IP - addresses to the master or set of masters, as well as the ILB VIP. + mainIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted + main network. This prefix will be used for assigning private IP + addresses to the main or set of mains, as well as the ILB VIP. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - the Google Cloud Monitoring service. * `none` - no metrics will be @@ -342,7 +342,7 @@ class Cluster(_messages.Message): podSecurityPolicyConfig: Configuration for the PodSecurityPolicy feature. privateCluster: If this is a private cluster setup. Private clusters are clusters that, by default have no external IP addresses on the nodes and - where nodes and the master communicate over private IP addresses. + where nodes and the main communicate over private IP addresses. resourceLabels: The resource labels for the cluster to use to annotate any related GCE resources. resourceUsageExportConfig: Configuration for exporting resource usages. @@ -377,7 +377,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -428,7 +428,7 @@ class AdditionalProperty(_messages.Message): clusterIpv4Cidr = _messages.StringField(6) conditions = _messages.MessageField('StatusCondition', 7, repeated=True) createTime = _messages.StringField(8) - currentMasterVersion = _messages.StringField(9) + currentMainVersion = _messages.StringField(9) currentNodeCount = _messages.IntegerField(10, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(11) databaseEncryptionKeyId = _messages.StringField(12) @@ -450,10 +450,10 @@ class AdditionalProperty(_messages.Message): loggingService = _messages.StringField(28) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 29) managedPodIdentityConfig = _messages.MessageField('ManagedPodIdentityConfig', 30) - masterAuth = _messages.MessageField('MasterAuth', 31) - masterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 32) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 33) - masterIpv4CidrBlock = _messages.StringField(34) + mainAuth = _messages.MessageField('MainAuth', 31) + mainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 32) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 33) + mainIpv4CidrBlock = _messages.StringField(34) monitoringService = _messages.StringField(35) name = _messages.StringField(36) network = _messages.StringField(37) @@ -568,18 +568,18 @@ class ClusterUpdate(_messages.Message): with Kubernetes-native resource model in Stackdriver * "logging.googleapis.com" - the Google Cloud Logging service * "none" - no logs will be exported from the cluster - desiredMasterAuthorizedNetworks: The desired configuration options for - master authorized networks feature. This field is deprecated, use - desired_master_authorized_networks_config instead. - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterId: An id of master replica to be updated. Can be set only - when desired_master_version is set. If not set, all replicas will be + desiredMainAuthorizedNetworks: The desired configuration options for + main authorized networks feature. This field is deprecated, use + desired_main_authorized_networks_config instead. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainId: An id of main replica to be updated. Can be set only + when desired_main_version is set. If not set, all replicas will be updated. - desiredMasterMachineType: The name of a Google Compute Engine [machine + desiredMainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - desiredMasterVersion: The Kubernetes version to change the master to. + main to. + desiredMainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest @@ -607,7 +607,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version desiredPodSecurityPolicyConfig: The desired configuration options for the PodSecurityPolicy feature. desiredUseIpAliases: The desired use of IP aliases in a cluster. @@ -624,11 +624,11 @@ class ClusterUpdate(_messages.Message): desiredImageType = _messages.StringField(9) desiredLocations = _messages.StringField(10, repeated=True) desiredLoggingService = _messages.StringField(11) - desiredMasterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 12) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 13) - desiredMasterId = _messages.StringField(14) - desiredMasterMachineType = _messages.StringField(15) - desiredMasterVersion = _messages.StringField(16) + desiredMainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 12) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 13) + desiredMainId = _messages.StringField(14) + desiredMainMachineType = _messages.StringField(15) + desiredMainVersion = _messages.StringField(16) desiredMonitoringService = _messages.StringField(17) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 18) desiredNodePoolId = _messages.StringField(19) @@ -653,7 +653,7 @@ class ClusterUpdateOptions(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -2154,8 +2154,8 @@ class ManagedPodIdentityConfig(_messages.Message): enabled = _messages.BooleanField(1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -2169,11 +2169,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, you can disable basic authentication by providing an empty username. """ @@ -2186,33 +2186,33 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworks(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworks(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. This message - is deprecated, use MasterAuthorizedNetworksConfig instead. + is deprecated, use MainAuthorizedNetworksConfig instead. Fields: cidrs: Network CIDRs define up to 10 external networks that could access - Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrs = _messages.MessageField('CIDR', 1, repeated=True) enabled = _messages.BooleanField(2) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -2291,7 +2291,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -2508,7 +2508,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2676,7 +2676,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2686,7 +2686,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2859,7 +2859,7 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ @@ -2867,7 +2867,7 @@ class ServerConfig(_messages.Message): defaultClusterVersion = _messages.StringField(2) defaultImageType = _messages.StringField(3) validImageTypes = _messages.StringField(4, repeated=True) - validMasterVersions = _messages.StringField(5, repeated=True) + validMainVersions = _messages.StringField(5, repeated=True) validNodeVersions = _messages.StringField(6, repeated=True) @@ -3085,15 +3085,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(6) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -3109,7 +3109,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -3129,7 +3129,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) version = _messages.StringField(6) zone = _messages.StringField(7) @@ -3430,16 +3430,16 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(7) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterMachineType: The name of a Google Compute Engine [machine + mainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - masterVersion: The Kubernetes version to change the master to. Users may + main to. + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -3457,8 +3457,8 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterMachineType = _messages.StringField(2) - masterVersion = _messages.StringField(3) + mainMachineType = _messages.StringField(2) + mainVersion = _messages.StringField(3) name = _messages.StringField(4) projectId = _messages.StringField(5) version = _messages.StringField(6) @@ -3487,7 +3487,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py index 2368fa42..9dd9c8ef 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py @@ -359,7 +359,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -649,32 +649,32 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1beta1/{+name}:setMasterAuth', + relative_path=u'v1beta1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -761,7 +761,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -814,29 +814,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1beta1/{+name}:updateMaster', + relative_path=u'v1beta1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1278,7 +1278,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1506,28 +1506,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1610,31 +1610,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1666,7 +1666,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py index 2cd1c6ad..c8011b0f 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py @@ -40,7 +40,7 @@ class AddonsConfig(_messages.Message): services in a cluster. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. """ @@ -202,8 +202,8 @@ class Cluster(_messages.Message): automatically chosen or specify a `/14` block in `10.0.0.0/8`. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. currentNodeVersion: [Output only] The current version of the node software @@ -213,21 +213,21 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1beta1) and features that - may not be production ready in the kubernetes version of the master and - nodes. The cluster has no SLA for uptime and master/node upgrades are + may not be production ready in the kubernetes version of the main and + nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. enableTpu: Enable the ability to use Cloud TPUs in this cluster. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -259,16 +259,16 @@ class Cluster(_messages.Message): cluster. * if left as an empty string,`logging.googleapis.com` will be used. maintenancePolicy: Configure the maintenance policy for this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. - masterAuthorizedNetworks: The configuration options for master authorized + mainAuthorizedNetworks: The configuration options for main authorized networks feature. This field is deprecated, use - master_authorized_networks_config instead. - masterAuthorizedNetworksConfig: The configuration options for master + main_authorized_networks_config instead. + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. - masterIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted - master network. This prefix will be used for assigning private IP - addresses to the master or set of masters, as well as the ILB VIP. + mainIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted + main network. This prefix will be used for assigning private IP + addresses to the main or set of mains, as well as the ILB VIP. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - the Google Cloud Monitoring service. * `none` - no metrics will be @@ -300,7 +300,7 @@ class Cluster(_messages.Message): podSecurityPolicyConfig: Configuration for the PodSecurityPolicy feature. privateCluster: If this is a private cluster setup. Private clusters are clusters that, by default have no external IP addresses on the nodes and - where nodes and the master communicate over private IP addresses. + where nodes and the main communicate over private IP addresses. resourceLabels: The resource labels for the cluster to use to annotate any related Google Compute Engine resources. selfLink: [Output only] Server-defined URL for the resource. @@ -332,7 +332,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -381,7 +381,7 @@ class AdditionalProperty(_messages.Message): binaryAuthorization = _messages.MessageField('BinaryAuthorization', 4) clusterIpv4Cidr = _messages.StringField(5) createTime = _messages.StringField(6) - currentMasterVersion = _messages.StringField(7) + currentMainVersion = _messages.StringField(7) currentNodeCount = _messages.IntegerField(8, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(9) description = _messages.StringField(10) @@ -399,10 +399,10 @@ class AdditionalProperty(_messages.Message): locations = _messages.StringField(22, repeated=True) loggingService = _messages.StringField(23) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 24) - masterAuth = _messages.MessageField('MasterAuth', 25) - masterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 26) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 27) - masterIpv4CidrBlock = _messages.StringField(28) + mainAuth = _messages.MessageField('MainAuth', 25) + mainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 26) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 27) + mainIpv4CidrBlock = _messages.StringField(28) monitoringService = _messages.StringField(29) name = _messages.StringField(30) network = _messages.StringField(31) @@ -510,18 +510,18 @@ class ClusterUpdate(_messages.Message): with Kubernetes-native resource model in Stackdriver * "logging.googleapis.com" - the Google Cloud Logging service * "none" - no logs will be exported from the cluster - desiredMasterAuthorizedNetworks: The desired configuration options for - master authorized networks feature. This field is deprecated, use - desired_master_authorized_networks_config instead. - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterId: An id of master replica to be updated. Can be set only - when desired_master_version is set. If not set, all replicas will be + desiredMainAuthorizedNetworks: The desired configuration options for + main authorized networks feature. This field is deprecated, use + desired_main_authorized_networks_config instead. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainId: An id of main replica to be updated. Can be set only + when desired_main_version is set. If not set, all replicas will be updated. - desiredMasterMachineType: The name of a Google Compute Engine [machine + desiredMainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - desiredMasterVersion: The Kubernetes version to change the master to. The + main to. + desiredMainVersion: The Kubernetes version to change the main to. The only valid value is the latest supported version. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the @@ -550,7 +550,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version desiredPodSecurityPolicyConfig: The desired configuration options for the PodSecurityPolicy feature. """ @@ -566,11 +566,11 @@ class ClusterUpdate(_messages.Message): desiredImageType = _messages.StringField(9) desiredLocations = _messages.StringField(10, repeated=True) desiredLoggingService = _messages.StringField(11) - desiredMasterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 12) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 13) - desiredMasterId = _messages.StringField(14) - desiredMasterMachineType = _messages.StringField(15) - desiredMasterVersion = _messages.StringField(16) + desiredMainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 12) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 13) + desiredMainId = _messages.StringField(14) + desiredMainMachineType = _messages.StringField(15) + desiredMainVersion = _messages.StringField(16) desiredMonitoringService = _messages.StringField(17) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 18) desiredNodePoolId = _messages.StringField(19) @@ -594,7 +594,7 @@ class ClusterUpdateOptions(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -2024,8 +2024,8 @@ class MaintenanceWindow(_messages.Message): dailyMaintenanceWindow = _messages.MessageField('DailyMaintenanceWindow', 1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -2039,11 +2039,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, you can disable basic authentication by providing an empty username. """ @@ -2056,33 +2056,33 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworks(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworks(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. This message - is deprecated, use MasterAuthorizedNetworksConfig instead. + is deprecated, use MainAuthorizedNetworksConfig instead. Fields: cidrs: Network CIDRs define up to 10 external networks that could access - Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrs = _messages.MessageField('CIDR', 1, repeated=True) enabled = _messages.BooleanField(2) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -2150,7 +2150,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -2364,7 +2364,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2524,7 +2524,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2534,7 +2534,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2692,7 +2692,7 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ @@ -2700,7 +2700,7 @@ class ServerConfig(_messages.Message): defaultClusterVersion = _messages.StringField(2) defaultImageType = _messages.StringField(3) validImageTypes = _messages.StringField(4, repeated=True) - validMasterVersions = _messages.StringField(5, repeated=True) + validMainVersions = _messages.StringField(5, repeated=True) validNodeVersions = _messages.StringField(6, repeated=True) @@ -2908,15 +2908,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(6) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -2932,7 +2932,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -2952,7 +2952,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) version = _messages.StringField(6) zone = _messages.StringField(7) @@ -3254,16 +3254,16 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(7) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterMachineType: The name of a Google Compute Engine [machine + mainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - masterVersion: The Kubernetes version to change the master to. Users may + main to. + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -3282,8 +3282,8 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterMachineType = _messages.StringField(2) - masterVersion = _messages.StringField(3) + mainMachineType = _messages.StringField(2) + mainVersion = _messages.StringField(3) name = _messages.StringField(4) projectId = _messages.StringField(5) version = _messages.StringField(6) @@ -3312,7 +3312,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py index 65b3bb26..db4958aa 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py @@ -124,14 +124,14 @@ class ClusterConfig(_messages.Message): gceClusterConfig: Required. The shared Compute Engine config settings for all instances in a cluster. initializationActions: Optional. Commands to execute on each node after - config is completed. By default, executables are run on master and all + config is completed. By default, executables are run on main and all worker nodes. You can test a node's role metadata to run an executable - on a master or worker node, as shown below using curl (you can also use + on a main or worker node, as shown below using curl (you can also use wget): ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1/instance/attributes/dataproc-role) if - [[ "${ROLE}" == 'Master' ]]; then ... master specific actions ... else + [[ "${ROLE}" == 'Main' ]]; then ... main specific actions ... else ... worker specific actions ... fi - masterConfig: Optional. The Compute Engine config settings for the master + mainConfig: Optional. The Compute Engine config settings for the main instance in a cluster. secondaryWorkerConfig: Optional. The Compute Engine config settings for additional worker instances in a cluster. @@ -144,7 +144,7 @@ class ClusterConfig(_messages.Message): configBucket = _messages.StringField(1) gceClusterConfig = _messages.MessageField('GceClusterConfig', 2) initializationActions = _messages.MessageField('NodeInitializationAction', 3, repeated=True) - masterConfig = _messages.MessageField('InstanceGroupConfig', 4) + mainConfig = _messages.MessageField('InstanceGroupConfig', 4) secondaryWorkerConfig = _messages.MessageField('InstanceGroupConfig', 5) softwareConfig = _messages.MessageField('SoftwareConfig', 6) workerConfig = _messages.MessageField('InstanceGroupConfig', 7) @@ -1065,7 +1065,7 @@ class AdditionalProperty(_messages.Message): class InstanceGroupConfig(_messages.Message): r"""Optional. The config settings for Compute Engine resources in an - instance group, such as a master or worker group. + instance group, such as a main or worker group. Fields: accelerators: Optional. The Compute Engine accelerator configuration for @@ -1091,7 +1091,7 @@ class InstanceGroupConfig(_messages.Message): Group Manager that manages this group. This is only used for preemptible instance groups. numInstances: Optional. The number of VM instances in the instance group. - For master instance groups, must be set to 1. + For main instance groups, must be set to 1. """ accelerators = _messages.MessageField('AcceleratorConfig', 1, repeated=True) @@ -2253,7 +2253,7 @@ class YarnApplication(_messages.Message): progress: Required. The numerical progress of the application, from 1 to 100. state: Required. The application state. - trackingUrl: Optional. The HTTP URL of the ApplicationMaster, + trackingUrl: Optional. The HTTP URL of the ApplicationMain, HistoryServer, or TimelineServer that provides application-specific information. The URL uses the internal hostname, and requires a proxy server for resolution and, possibly, access. diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py index 1b1663c6..9c940e80 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py @@ -150,16 +150,16 @@ class ClusterConfig(_messages.Message): gceClusterConfig: Required. The shared Compute Engine config settings for all instances in a cluster. initializationActions: Optional. Commands to execute on each node after - config is completed. By default, executables are run on master and all + config is completed. By default, executables are run on main and all worker nodes. You can test a node's role metadata to run an - executable on a master or worker node, as shown below using curl (you + executable on a main or worker node, as shown below using curl (you can also use wget): ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1beta2/instance/attributes/dataproc- - role) if [[ "${ROLE}" == 'Master' ]]; then ... master specific actions + role) if [[ "${ROLE}" == 'Main' ]]; then ... main specific actions ... else ... worker specific actions ... fi lifecycleConfig: Optional. The config setting for auto delete cluster schedule. - masterConfig: Optional. The Compute Engine config settings for the master + mainConfig: Optional. The Compute Engine config settings for the main instance in a cluster. secondaryWorkerConfig: Optional. The Compute Engine config settings for additional worker instances in a cluster. @@ -174,7 +174,7 @@ class ClusterConfig(_messages.Message): gceClusterConfig = _messages.MessageField('GceClusterConfig', 3) initializationActions = _messages.MessageField('NodeInitializationAction', 4, repeated=True) lifecycleConfig = _messages.MessageField('LifecycleConfig', 5) - masterConfig = _messages.MessageField('InstanceGroupConfig', 6) + mainConfig = _messages.MessageField('InstanceGroupConfig', 6) secondaryWorkerConfig = _messages.MessageField('InstanceGroupConfig', 7) softwareConfig = _messages.MessageField('SoftwareConfig', 8) workerConfig = _messages.MessageField('InstanceGroupConfig', 9) @@ -1579,7 +1579,7 @@ class AdditionalProperty(_messages.Message): class InstanceGroupConfig(_messages.Message): r"""Optional. The config settings for Compute Engine resources in an - instance group, such as a master or worker group. + instance group, such as a main or worker group. Fields: accelerators: Optional. The Compute Engine accelerator configuration for @@ -1608,7 +1608,7 @@ class InstanceGroupConfig(_messages.Message): minCpuPlatform: Optional. Specifies the minimum cpu platform for the Instance Group. See Cloud Dataproc→Minimum CPU Platform. numInstances: Optional. The number of VM instances in the instance group. - For master instance groups, must be set to 1. + For main instance groups, must be set to 1. """ accelerators = _messages.MessageField('AcceleratorConfig', 1, repeated=True) @@ -3251,7 +3251,7 @@ class YarnApplication(_messages.Message): progress: Required. The numerical progress of the application, from 1 to 100. state: Required. The application state. - trackingUrl: Optional. The HTTP URL of the ApplicationMaster, + trackingUrl: Optional. The HTTP URL of the ApplicationMain, HistoryServer, or TimelineServer that provides application-specific information. The URL uses the internal hostname, and requires a proxy server for resolution and, possibly, access. diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py index 844b52b1..c06366c7 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py @@ -1481,8 +1481,8 @@ class FormatValueValuesEnum(_messages.Enum): this reason, uncompressed VCF is currently recommended for imports with more than 1GB combined uncompressed size, or for time sensitive imports. - FORMAT_COMPLETE_GENOMICS: Complete Genomics masterVarBeta format. The - masterVarBeta files may be bzip2 compressed. + FORMAT_COMPLETE_GENOMICS: Complete Genomics mainVarBeta format. The + mainVarBeta files may be bzip2 compressed. """ FORMAT_UNSPECIFIED = 0 FORMAT_VCF = 1 diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py index 0b076492..b1895d69 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py @@ -930,14 +930,14 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): TensorFlow program as the '--job-dir' command-line argument. The benefit of specifying this field is that Cloud ML validates the path for use in training. - masterType: Optional. Specifies the type of virtual machine to use for - your training job's master worker. The following types are supported: + mainType: Optional. Specifies the type of virtual machine to use for + your training job's main worker. The following types are supported:
standard
A basic machine configuration suitable for training simple models with small to moderate datasets.
large_model
A machine with a lot of memory, specially suited for parameter servers when your model is large (having many hidden layers or layers with very large numbers of nodes).
-
complex_model_s
A machine suitable for the master and +
complex_model_s
A machine suitable for the main and workers of the cluster when your model requires more computation than the standard machine can handle satisfactorily.
complex_model_m
A machine with roughly twice the @@ -972,7 +972,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): also set `parameter_server_type`. parameterServerType: Optional. Specifies the type of virtual machine to use for your training job's parameter server. The supported values are - the same as those described in the entry for `master_type`. This value + the same as those described in the entry for `main_type`. This value must be present when `scaleTier` is set to `CUSTOM` and `parameter_server_count` is greater than zero. pythonModule: Required. The Python module name to run after installing the @@ -995,7 +995,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): to `CUSTOM`. If you set this value, you must also set `worker_type`. workerType: Optional. Specifies the type of virtual machine to use for your training job's worker nodes. The supported values are the same as - those described in the entry for `masterType`. This value must be + those described in the entry for `mainType`. This value must be present when `scaleTier` is set to `CUSTOM` and `workerCount` is greater than zero. """ @@ -1017,8 +1017,8 @@ class ScaleTierValueValuesEnum(_messages.Enum): CUSTOM: The CUSTOM tier is not a set tier, but rather enables you to use your own cluster specification. When you use this tier, set values to configure your processing cluster according to these guidelines: * - You _must_ set `TrainingInput.masterType` to specify the type of - machine to use for your master node. This is the only required + You _must_ set `TrainingInput.mainType` to specify the type of + machine to use for your main node. This is the only required setting. * You _may_ set `TrainingInput.workerCount` to specify the number of workers to use. If you specify one or more workers, you _must_ also set `TrainingInput.workerType` to specify the type of @@ -1028,9 +1028,9 @@ class ScaleTierValueValuesEnum(_messages.Enum): servers, you _must_ also set `TrainingInput.parameterServerType` to specify the type of machine to use for your parameter servers. Note that all of your workers must use the same machine type, which - can be different from your parameter server type and master type. Your + can be different from your parameter server type and main type. Your parameter servers must likewise use the same machine type, which can - be different from your worker type and master type. + be different from your worker type and main type. """ BASIC = 0 STANDARD_1 = 1 @@ -1042,7 +1042,7 @@ class ScaleTierValueValuesEnum(_messages.Enum): args = _messages.StringField(1, repeated=True) hyperparameters = _messages.MessageField('GoogleCloudMlV1HyperparameterSpec', 2) jobDir = _messages.StringField(3) - masterType = _messages.StringField(4) + mainType = _messages.StringField(4) packageUris = _messages.StringField(5, repeated=True) parameterServerCount = _messages.IntegerField(6) parameterServerType = _messages.StringField(7) diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py index c7fab2a0..b6d809df 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py @@ -161,7 +161,7 @@ class DatabaseInstance(_messages.Message): ipAddresses: The assigned IP addresses for the instance. ipv6Address: The IPv6 address assigned to the instance. kind: This is always sql#instance. - masterInstanceName: The name of the instance which will act as master in + mainInstanceName: The name of the instance which will act as main in the replication setup. maxDiskSize: The maximum disk size of the instance in bytes. project: The project ID of the project containing the Cloud SQL instance. @@ -191,7 +191,7 @@ class DatabaseInstance(_messages.Message): ipAddresses = _messages.MessageField('IpMapping', 7, repeated=True) ipv6Address = _messages.StringField(8) kind = _messages.StringField(9, default=u'sql#instance') - masterInstanceName = _messages.StringField(10) + mainInstanceName = _messages.StringField(10) maxDiskSize = _messages.IntegerField(11) project = _messages.StringField(12) region = _messages.StringField(13) diff --git a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py index d734285a..df7f6048 100644 --- a/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py +++ b/google-cloud-sdk/.install/.backup/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py @@ -220,14 +220,14 @@ class DatabaseInstance(_messages.Message): secondary zone. instanceType: The instance type. This can be one of the following. CLOUD_SQL_INSTANCE: A Cloud SQL instance that is not replicating from a - master. ON_PREMISES_INSTANCE: An instance running on the customer's + main. ON_PREMISES_INSTANCE: An instance running on the customer's premises. READ_REPLICA_INSTANCE: A Cloud SQL instance configured as a read-replica. ipAddresses: The assigned IP addresses for the instance. ipv6Address: The IPv6 address assigned to the instance. This property is applicable only to First Generation instances. kind: This is always sql#instance. - masterInstanceName: The name of the instance which will act as master in + mainInstanceName: The name of the instance which will act as main in the replication setup. maxDiskSize: The maximum disk size of the instance in bytes. name: Name of the Cloud SQL instance. This does not include the project @@ -241,7 +241,7 @@ class DatabaseInstance(_messages.Message): type (First Generation or Second Generation). The region can not be changed after instance creation. replicaConfiguration: Configuration specific to read-replicas replicating - from on-premises masters. + from on-premises mains. replicaNames: The replicas of the instance. selfLink: The URI of this resource. serverCaCert: SSL configuration. @@ -266,7 +266,7 @@ class FailoverReplicaValue(_messages.Message): Fields: available: The availability status of the failover replica. A false - status indicates that the failover replica is out of sync. The master + status indicates that the failover replica is out of sync. The main can only failover to the falover replica when the status is true. name: The name of the failover replica. If specified at instance creation, a failover replica is created for the instance. The name @@ -288,7 +288,7 @@ class FailoverReplicaValue(_messages.Message): ipAddresses = _messages.MessageField('IpMapping', 9, repeated=True) ipv6Address = _messages.StringField(10) kind = _messages.StringField(11, default=u'sql#instance') - masterInstanceName = _messages.StringField(12) + mainInstanceName = _messages.StringField(12) maxDiskSize = _messages.IntegerField(13) name = _messages.StringField(14) onPremisesConfiguration = _messages.MessageField('OnPremisesConfiguration', 15) @@ -316,57 +316,57 @@ class DatabasesListResponse(_messages.Message): kind = _messages.StringField(2, default=u'sql#databasesList') -class DemoteMasterConfiguration(_messages.Message): - r"""Read-replica configuration for connecting to the on-premises master. +class DemoteMainConfiguration(_messages.Message): + r"""Read-replica configuration for connecting to the on-premises main. Fields: - kind: This is always sql#demoteMasterConfiguration. + kind: This is always sql#demoteMainConfiguration. mysqlReplicaConfiguration: MySQL specific configuration when replicating - from a MySQL on-premises master. Replication configuration information + from a MySQL on-premises main. Replication configuration information such as the username, password, certificates, and keys are not stored in the instance metadata. The configuration information is used only to set up the replication connection and is stored by MySQL in a file named - master.info in the data directory. + main.info in the data directory. """ - kind = _messages.StringField(1, default=u'sql#demoteMasterConfiguration') - mysqlReplicaConfiguration = _messages.MessageField('DemoteMasterMySqlReplicaConfiguration', 2) + kind = _messages.StringField(1, default=u'sql#demoteMainConfiguration') + mysqlReplicaConfiguration = _messages.MessageField('DemoteMainMySqlReplicaConfiguration', 2) -class DemoteMasterContext(_messages.Message): - r"""Database instance demote master context. +class DemoteMainContext(_messages.Message): + r"""Database instance demote main context. Fields: - kind: This is always sql#demoteMasterContext. - masterInstanceName: The name of the instance which will act as on-premises - master in the replication setup. + kind: This is always sql#demoteMainContext. + mainInstanceName: The name of the instance which will act as on-premises + main in the replication setup. replicaConfiguration: Configuration specific to read-replicas replicating - from the on-premises master. + from the on-premises main. verifyGtidConsistency: Verify GTID consistency for demote operation. Default value: True. Second Generation instances only. Setting this flag to false enables you to bypass GTID consistency check between on- - premises master and Cloud SQL instance during the demotion operation but + premises main and Cloud SQL instance during the demotion operation but also exposes you to the risk of future replication failures. Change the value only if you know the reason for the GTID divergence and are confident that doing so will not cause any replication issues. """ - kind = _messages.StringField(1, default=u'sql#demoteMasterContext') - masterInstanceName = _messages.StringField(2) - replicaConfiguration = _messages.MessageField('DemoteMasterConfiguration', 3) + kind = _messages.StringField(1, default=u'sql#demoteMainContext') + mainInstanceName = _messages.StringField(2) + replicaConfiguration = _messages.MessageField('DemoteMainConfiguration', 3) verifyGtidConsistency = _messages.BooleanField(4) -class DemoteMasterMySqlReplicaConfiguration(_messages.Message): +class DemoteMainMySqlReplicaConfiguration(_messages.Message): r"""Read-replica configuration specific to MySQL databases. Fields: caCertificate: PEM representation of the trusted CA's x509 certificate. - clientCertificate: PEM representation of the slave's x509 certificate. - clientKey: PEM representation of the slave's private key. The + clientCertificate: PEM representation of the subordinate's x509 certificate. + clientKey: PEM representation of the subordinate's private key. The corresponsing public key is encoded in the client's certificate. The - format of the slave's private key can be either PKCS #1 or PKCS #8. - kind: This is always sql#demoteMasterMysqlReplicaConfiguration. + format of the subordinate's private key can be either PKCS #1 or PKCS #8. + kind: This is always sql#demoteMainMysqlReplicaConfiguration. password: The password for the replication connection. username: The username for the replication connection. """ @@ -374,7 +374,7 @@ class DemoteMasterMySqlReplicaConfiguration(_messages.Message): caCertificate = _messages.StringField(1) clientCertificate = _messages.StringField(2) clientKey = _messages.StringField(3) - kind = _messages.StringField(4, default=u'sql#demoteMasterMysqlReplicaConfiguration') + kind = _messages.StringField(4, default=u'sql#demoteMainMysqlReplicaConfiguration') password = _messages.StringField(5) username = _messages.StringField(6) @@ -542,14 +542,14 @@ class InstancesCloneRequest(_messages.Message): cloneContext = _messages.MessageField('CloneContext', 1) -class InstancesDemoteMasterRequest(_messages.Message): - r"""Database demote master request. +class InstancesDemoteMainRequest(_messages.Message): + r"""Database demote main request. Fields: - demoteMasterContext: Contains details about the demoteMaster operation. + demoteMainContext: Contains details about the demoteMain operation. """ - demoteMasterContext = _messages.MessageField('DemoteMasterContext', 1) + demoteMainContext = _messages.MessageField('DemoteMainContext', 1) class InstancesExportRequest(_messages.Message): @@ -723,24 +723,24 @@ class MySqlReplicaConfiguration(_messages.Message): Fields: caCertificate: PEM representation of the trusted CA's x509 certificate. - clientCertificate: PEM representation of the slave's x509 certificate. - clientKey: PEM representation of the slave's private key. The + clientCertificate: PEM representation of the subordinate's x509 certificate. + clientKey: PEM representation of the subordinate's private key. The corresponsing public key is encoded in the client's certificate. connectRetryInterval: Seconds to wait between connect retries. MySQL's default is 60 seconds. dumpFilePath: Path to a SQL dump file in Google Cloud Storage from which - the slave instance is to be created. The URI is in the form + the subordinate instance is to be created. The URI is in the form gs://bucketName/fileName. Compressed gzip files (.gz) are also supported. Dumps should have the binlog co-ordinates from which - replication should begin. This can be accomplished by setting --master- + replication should begin. This can be accomplished by setting --main- data to 1 when using mysqldump. kind: This is always sql#mysqlReplicaConfiguration. - masterHeartbeatPeriod: Interval in milliseconds between replication + mainHeartbeatPeriod: Interval in milliseconds between replication heartbeats. password: The password for the replication connection. sslCipher: A list of permissible ciphers to use for SSL encryption. username: The username for the replication connection. - verifyServerCertificate: Whether or not to check the master's Common Name + verifyServerCertificate: Whether or not to check the main's Common Name value in the certificate that it sends during the SSL handshake. """ @@ -750,7 +750,7 @@ class MySqlReplicaConfiguration(_messages.Message): connectRetryInterval = _messages.IntegerField(4, variant=_messages.Variant.INT32) dumpFilePath = _messages.StringField(5) kind = _messages.StringField(6, default=u'sql#mysqlReplicaConfiguration') - masterHeartbeatPeriod = _messages.IntegerField(7) + mainHeartbeatPeriod = _messages.IntegerField(7) password = _messages.StringField(8) sslCipher = _messages.StringField(9) username = _messages.StringField(10) @@ -863,22 +863,22 @@ class OperationsListResponse(_messages.Message): class ReplicaConfiguration(_messages.Message): - r"""Read-replica configuration for connecting to the master. + r"""Read-replica configuration for connecting to the main. Fields: failoverTarget: Specifies if the replica is the failover target. If the field is set to true the replica will be designated as a failover - replica. In case the master instance fails, the replica instance will be - promoted as the new master instance. Only one replica can be specified + replica. In case the main instance fails, the replica instance will be + promoted as the new main instance. Only one replica can be specified as failover target, and the replica has to be in different zone with the - master instance. + main instance. kind: This is always sql#replicaConfiguration. mysqlReplicaConfiguration: MySQL specific configuration when replicating - from a MySQL on-premises master. Replication configuration information + from a MySQL on-premises main. Replication configuration information such as the username, password, certificates, and keys are not stored in the instance metadata. The configuration information is used only to set up the replication connection and is stored by MySQL in a file named - master.info in the data directory. + main.info in the data directory. """ failoverTarget = _messages.BooleanField(1) @@ -1217,18 +1217,18 @@ class SqlInstancesDeleteRequest(_messages.Message): project = _messages.StringField(2, required=True) -class SqlInstancesDemoteMasterRequest(_messages.Message): - r"""A SqlInstancesDemoteMasterRequest object. +class SqlInstancesDemoteMainRequest(_messages.Message): + r"""A SqlInstancesDemoteMainRequest object. Fields: instance: Cloud SQL instance name. - instancesDemoteMasterRequest: A InstancesDemoteMasterRequest resource to + instancesDemoteMainRequest: A InstancesDemoteMainRequest resource to be passed as the request body. project: ID of the project that contains the instance. """ instance = _messages.StringField(1, required=True) - instancesDemoteMasterRequest = _messages.MessageField('InstancesDemoteMasterRequest', 2) + instancesDemoteMainRequest = _messages.MessageField('InstancesDemoteMainRequest', 2) project = _messages.StringField(3, required=True) diff --git a/google-cloud-sdk/.install/.backup/lib/surface/auth/application_default/login.py b/google-cloud-sdk/.install/.backup/lib/surface/auth/application_default/login.py index 9ac3ad30..ae9e101d 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/auth/application_default/login.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/auth/application_default/login.py @@ -48,7 +48,7 @@ class Login(base.Command): instructions at https://developers.google.com/identity/protocols/application-default-credentials#calling. - API enablement and quotas are managed by the master Application Default + API enablement and quotas are managed by the main Application Default Credentials project. In the case of errors related to the API not being enabled or quota limitations, use the `--client-id-file` flag. You can create the client-id-file at https://console.cloud.google.com/apis/credentials. diff --git a/google-cloud-sdk/.install/.backup/lib/surface/billing/accounts/list.py b/google-cloud-sdk/.install/.backup/lib/surface/billing/accounts/list.py index 380053be..5f09d626 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/billing/accounts/list.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/billing/accounts/list.py @@ -45,7 +45,7 @@ def Args(parser): name.basename():label=ACCOUNT_ID, displayName:label=NAME, open, - masterBillingAccount.basename():label=MASTER_ACCOUNT_ID + mainBillingAccount.basename():label=MASTER_ACCOUNT_ID ) """) parser.display_info.AddUriFunc(List.ToSelfLink) diff --git a/google-cloud-sdk/.install/.backup/lib/surface/compute/images/import.py b/google-cloud-sdk/.install/.backup/lib/surface/compute/images/import.py index 20727d48..de344729 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/compute/images/import.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/compute/images/import.py @@ -49,7 +49,7 @@ _IMPORT_FROM_IMAGE_WORKFLOW = _WORKFLOW_DIR + 'import_from_image.wf.json' _IMPORT_AND_TRANSLATE_WORKFLOW = _WORKFLOW_DIR + 'import_and_translate.wf.json' _WORKFLOWS_URL = ('https://github.com/GoogleCloudPlatform/compute-image-tools/' - 'tree/master/daisy_workflows/image_import') + 'tree/main/daisy_workflows/image_import') def _IsLocalFile(file_name): diff --git a/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/attestors/public_keys/__init__.py b/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/attestors/public_keys/__init__.py index 96229d2d..ef9812d1 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/attestors/public_keys/__init__.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/attestors/public_keys/__init__.py @@ -36,8 +36,8 @@ class PublicKeys(base.Group): ## PGP KEY STRUCTURE An important feature of PGP keys is that they are hierarchical: Every "PGP - key" is composed of a "master" key pair and zero or more "subkey" pairs - certified by the master. These key pairs are collectively known as the "PGP + key" is composed of a "main" key pair and zero or more "subkey" pairs + certified by the main. These key pairs are collectively known as the "PGP key." The "public" part of this PGP key contains the public keys of all the constituent keys as well as all associated metadata (e.g. an email address). And, as might be expected, the "private" part of the PGP key contains all @@ -46,11 +46,11 @@ class PublicKeys(base.Group): One property of subkeys is that they may be marked as "revoked" if they are compromised or otherwise need to be retired. This does not remove the subkey from the PGP key but simply adds metadata indicating this revocation. The - master key pair cannot be revoked by this same mechanism. + main key pair cannot be revoked by this same mechanism. ### COMMON KEY STRUCTURE - The most common key structure is to have the master key pair only used to + The most common key structure is to have the main key pair only used to certify subkey pairs while the subkeys are used to encrypt and sign as necessary. This allows the PGP key as a whole to act as a durable identity even if an encryption key is used improperly or a signing key is compromised. diff --git a/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/authorities/public_keys/__init__.py b/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/authorities/public_keys/__init__.py index db675424..ea89b4d0 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/authorities/public_keys/__init__.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/container/binauthz/authorities/public_keys/__init__.py @@ -36,8 +36,8 @@ class PublicKeys(base.Group): ## PGP KEY STRUCTURE An important feature of PGP keys is that they are hierarchical: Every "PGP - key" is composed of a "master" key pair and zero or more "subkey" pairs - certified by the master. These key pairs are collectively known as the "PGP + key" is composed of a "main" key pair and zero or more "subkey" pairs + certified by the main. These key pairs are collectively known as the "PGP key." The "public" part of this PGP key contains the public keys of all the constituent keys as well as all associated metadata (e.g. an email address). And, as might be expected, the "private" part of the PGP key contains all @@ -46,11 +46,11 @@ class PublicKeys(base.Group): One property of subkeys is that they may be marked as "revoked" if they are compromised or otherwise need to be retired. This does not remove the subkey from the PGP key but simply adds metadata indicating this revocation. The - master key pair cannot be revoked by this same mechanism. + main key pair cannot be revoked by this same mechanism. ### COMMON KEY STRUCTURE - The most common key structure is to have the master key pair only used to + The most common key structure is to have the main key pair only used to certify subkey pairs while the subkeys are used to encrypt and sign as necessary. This allows the PGP key as a whole to act as a durable identity even if an encryption key is used improperly or a signing key is compromised. diff --git a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/create.py b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/create.py index 7b79d6cd..8324222d 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/create.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/create.py @@ -191,7 +191,7 @@ def ParseCreateOptionsBase(args): flags.WarnForUnspecifiedAutorepair(args) flags.WarnForUnspecifiedIpAllocationPolicy(args) cluster_ipv4_cidr = args.cluster_ipv4_cidr - enable_master_authorized_networks = args.enable_master_authorized_networks + enable_main_authorized_networks = args.enable_main_authorized_networks return api_adapter.CreateClusterOptions( accelerators=args.accelerator, additional_zones=args.additional_zones, @@ -211,7 +211,7 @@ def ParseCreateOptionsBase(args): enable_ip_alias=args.enable_ip_alias, enable_kubernetes_alpha=args.enable_kubernetes_alpha, enable_legacy_authorization=args.enable_legacy_authorization, - enable_master_authorized_networks=enable_master_authorized_networks, + enable_main_authorized_networks=enable_main_authorized_networks, enable_network_policy=args.enable_network_policy, image_type=args.image_type, image=args.image, @@ -221,7 +221,7 @@ def ParseCreateOptionsBase(args): labels=args.labels, local_ssd_count=args.local_ssd_count, maintenance_window=args.maintenance_window, - master_authorized_networks=args.master_authorized_networks, + main_authorized_networks=args.main_authorized_networks, max_nodes=args.max_nodes, max_nodes_per_pool=args.max_nodes_per_pool, min_cpu_platform=args.min_cpu_platform, @@ -263,7 +263,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddNetworkPolicyFlags(parser) flags.AddNodeTaintsFlag(parser) @@ -375,7 +375,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddWorkloadMetadataFromNodeFlag(parser) flags.AddNetworkPolicyFlags(parser) @@ -404,7 +404,7 @@ def ParseCreateOptions(self, args): ops.allow_route_overlap = args.allow_route_overlap ops.new_scopes_behavior = True ops.private_cluster = args.private_cluster - ops.master_ipv4_cidr = args.master_ipv4_cidr + ops.main_ipv4_cidr = args.main_ipv4_cidr ops.enable_stackdriver_kubernetes = args.enable_stackdriver_kubernetes ops.enable_binauthz = args.enable_binauthz ops.enable_tpu = args.enable_tpu @@ -435,7 +435,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDAndLocalSSDVolumeConfigsFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddWorkloadMetadataFromNodeFlag(parser) flags.AddNetworkPolicyFlags(parser) @@ -466,7 +466,7 @@ def ParseCreateOptions(self, args): ops.enable_pod_security_policy = args.enable_pod_security_policy ops.allow_route_overlap = args.allow_route_overlap ops.private_cluster = args.private_cluster - ops.master_ipv4_cidr = args.master_ipv4_cidr + ops.main_ipv4_cidr = args.main_ipv4_cidr ops.new_scopes_behavior = True ops.enable_tpu = args.enable_tpu ops.tpu_ipv4_cidr = args.tpu_ipv4_cidr diff --git a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/delete.py b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/delete.py index d7943780..3f491a7e 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/delete.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/delete.py @@ -33,7 +33,7 @@ class Delete(base.DeleteCommand): When you delete a cluster, the following resources are deleted: - - The master resources + - The main resources - All of the node instances in the cluster - Any Pods that are running on those instances - Any firewalls and routes created by Kubernetes Engine at the time of cluster diff --git a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/get_credentials.py b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/get_credentials.py index 25e71dd7..f0a5f151 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/get_credentials.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/get_credentials.py @@ -87,7 +87,7 @@ def Run(self, args): log.status.Print('Fetching cluster endpoint and auth data.') # Call DescribeCluster to get auth info and cache for next time cluster = adapter.GetCluster(cluster_ref) - auth = cluster.masterAuth + auth = cluster.mainAuth # TODO(b/70856999) Make this consistent with the checks in # api_lib/container/kubeconfig.py. missing_creds = not (auth and auth.clientCertificate and auth.clientKey) diff --git a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/update.py b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/update.py index 6bc79cea..14e01767 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/update.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/update.py @@ -180,7 +180,7 @@ def Args(parser): _AddMutuallyExclusiveArgs(group, base.ReleaseTrack.GA) flags.AddNodeLocationsFlag(group_locations) flags.AddClusterAutoscalingFlags(parser, group) - flags.AddMasterAuthorizedNetworksFlags(parser, + flags.AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) @@ -243,32 +243,32 @@ def Run(self, args): if args.username is not None or args.enable_basic_auth is not None: flags.MungeBasicAuthFlags(args) - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.SET_USERNAME, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.SET_USERNAME, username=args.username, password=args.password) try: - op_ref = adapter.SetMasterAuth(cluster_ref, options) + op_ref = adapter.SetMainAuth(cluster_ref, options) except apitools_exceptions.HttpError as error: raise exceptions.HttpException(error, util.HTTP_ERROR_FORMAT) elif (args.generate_password or args.set_password or args.password is not None): if args.generate_password: password = '' - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.GENERATE_PASSWORD, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.GENERATE_PASSWORD, password=password) else: password = args.password if args.password is None: password = input('Please enter the new password:') - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.SET_PASSWORD, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.SET_PASSWORD, password=password) try: - op_ref = adapter.SetMasterAuth(cluster_ref, options) + op_ref = adapter.SetMainAuth(cluster_ref, options) del password del options except apitools_exceptions.HttpError as error: @@ -292,7 +292,7 @@ def Run(self, args): elif args.start_ip_rotation or args.start_credential_rotation: if args.start_ip_rotation: msg_tmpl = """This will start an IP Rotation on cluster [{name}]. The \ -master will be updated to serve on a new IP address in addition to the current \ +main will be updated to serve on a new IP address in addition to the current \ IP address. Kubernetes Engine will then recreate all nodes ({num_nodes} nodes) \ to point to the new IP address. This operation is long-running and will block \ other operations on the cluster (including delete) until it has run to \ @@ -300,7 +300,7 @@ def Run(self, args): rotate_credentials = False elif args.start_credential_rotation: msg_tmpl = """This will start an IP and Credentials Rotation on cluster\ - [{name}]. The master will be updated to serve on a new IP address in addition \ + [{name}]. The main will be updated to serve on a new IP address in addition \ to the current IP address, and cluster credentials will be rotated. Kubernetes \ Engine will then recreate all nodes ({num_nodes} nodes) to point to the new IP \ address. This operation is long-running and will block other operations on the \ @@ -319,7 +319,7 @@ def Run(self, args): elif args.complete_ip_rotation or args.complete_credential_rotation: if args.complete_ip_rotation: msg_tmpl = """This will complete the in-progress IP Rotation on \ -cluster [{name}]. The master will be updated to stop serving on the old IP \ +cluster [{name}]. The main will be updated to stop serving on the old IP \ address and only serve on the new IP address. Make sure all API clients have \ been updated to communicate with the new IP address (e.g. by running `gcloud \ container clusters get-credentials --project {project} --zone {zone} {name}`). \ @@ -327,7 +327,7 @@ def Run(self, args): (including delete) until it has run to completion.""" elif args.complete_credential_rotation: msg_tmpl = """This will complete the in-progress Credential Rotation on\ - cluster [{name}]. The master will be updated to stop serving on the old IP \ + cluster [{name}]. The main will be updated to stop serving on the old IP \ address and only serve on the new IP address. Old cluster credentials will be \ invalidated. Make sure all API clients have been updated to communicate with \ the new IP address (e.g. by running `gcloud container clusters get-credentials \ @@ -404,7 +404,7 @@ def Args(parser): group_locations = group.add_mutually_exclusive_group() _AddAdditionalZonesArg(group_locations, deprecated=True) flags.AddNodeLocationsFlag(group_locations) - flags.AddMasterAuthorizedNetworksFlags(parser, + flags.AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) @@ -447,7 +447,7 @@ def Args(parser): group_locations = group.add_mutually_exclusive_group() _AddAdditionalZonesArg(group_locations, deprecated=True) flags.AddNodeLocationsFlag(group_locations) - flags.AddMasterAuthorizedNetworksFlags(parser, + flags.AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) diff --git a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/upgrade.py b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/upgrade.py index 64e38f69..ecf8fcc5 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/upgrade.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/container/clusters/upgrade.py @@ -51,20 +51,20 @@ class UpgradeHelpText(object): class VersionVerifier(object): - """Compares the cluster and master versions for upgrade availablity.""" + """Compares the cluster and main versions for upgrade availablity.""" UP_TO_DATE = 0 UPGRADE_AVAILABLE = 1 SUPPORT_ENDING = 2 UNSUPPORTED = 3 - def Compare(self, current_master_version, current_cluster_version): - """Compares the cluster and master versions and returns an enum.""" - # TODO(b/36051978):update the if condition when we roll the master version - if current_master_version == current_cluster_version: + def Compare(self, current_main_version, current_cluster_version): + """Compares the cluster and main versions and returns an enum.""" + # TODO(b/36051978):update the if condition when we roll the main version + if current_main_version == current_cluster_version: return self.UP_TO_DATE - master_version = SemVer(current_master_version) + main_version = SemVer(current_main_version) cluster_version = SemVer(current_cluster_version) - major, minor, _ = master_version.Distance(cluster_version) + major, minor, _ = main_version.Distance(cluster_version) if major != 0 or minor > 2: return self.UNSUPPORTED elif minor > 1: @@ -90,13 +90,13 @@ def _Args(parser): The Kubernetes release version to which to upgrade the cluster's nodes. When upgrading nodes, the minor version (*X.Y*.Z) must be no greater than the -cluster master's minor version (i.e. if the master's version is 1.2.34, the +cluster main's minor version (i.e. if the main's version is 1.2.34, the nodes cannot be upgraded to 1.3.45). For any minor version, only the latest patch version (X.Y.*Z*) is allowed (i.e. if there exists a version 1.2.34, the nodes cannot be upgraded to 1.2.33). Omit to upgrade to the same version as the -master. +main. -When upgrading master, the only valid value is the latest supported version. +When upgrading main, the only valid value is the latest supported version. Omit to have the server automatically select the latest version. You can find the list of allowed versions for upgrades by running: @@ -107,10 +107,10 @@ def _Args(parser): '--node-pool', help='The node pool to upgrade.') parser.add_argument( - '--master', - help='Upgrade the cluster\'s master to the latest version of Kubernetes' + '--main', + help='Upgrade the cluster\'s main to the latest version of Kubernetes' ' supported on Kubernetes Engine. Nodes cannot be upgraded at the same' - ' time as the master.', + ' time as the main.', action='store_true') flags.AddAsyncFlag(parser) flags.AddImageTypeFlag(parser, 'cluster/node pool') @@ -155,7 +155,7 @@ def Run(self, args): upgrade_message = container_command_util.ClusterUpgradeMessage( name=args.name, cluster=cluster, - master=args.master, + main=args.main, node_pool_name=args.node_pool, new_version=args.cluster_version, concurrent_node_count=concurrent_node_count) @@ -167,8 +167,8 @@ def Run(self, args): options = api_adapter.UpdateClusterOptions( version=args.cluster_version, - update_master=args.master, - update_nodes=(not args.master), + update_main=args.main, + update_nodes=(not args.main), node_pool=args.node_pool, image_type=args.image_type, image=args.image, @@ -190,12 +190,12 @@ def Run(self, args): 'DESCRIPTION': """\ Upgrades the Kubernetes version of an existing container cluster. - This command upgrades the Kubernetes version of the *nodes* or *master* of - a cluster. Note that the Kubernetes version of the cluster's *master* is + This command upgrades the Kubernetes version of the *nodes* or *main* of + a cluster. Note that the Kubernetes version of the cluster's *main* is also periodically upgraded automatically as new releases are available. If desired cluster version is omitted, *node* upgrades default to the - current *master* version and *master* upgrades default to the latest + current *main* version and *main* upgrades default to the latest supported version. *By running this command, all of the cluster's nodes will be deleted and* @@ -211,7 +211,7 @@ def Run(self, args): """, 'EXAMPLES': """\ Upgrade the nodes of to the Kubernetes version of the cluster's - master. + main. $ {command} @@ -219,9 +219,9 @@ def Run(self, args): $ {command} --cluster-version "x.y.z" - Upgrade the master of to the latest supported version: + Upgrade the main of to the latest supported version: - $ {command} --master" + $ {command} --main" """, } diff --git a/google-cloud-sdk/.install/.backup/lib/surface/dataproc/clusters/create.py b/google-cloud-sdk/.install/.backup/lib/surface/dataproc/clusters/create.py index f884c787..4d39032e 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/dataproc/clusters/create.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/dataproc/clusters/create.py @@ -148,7 +148,7 @@ def Args(parser): kms_resource_args.AddKmsKeyResourceArg( parser, 'cluster', flag_overrides=kms_flag_overrides) - for instance_type in ('master', 'worker'): + for instance_type in ('main', 'worker'): help_msg = """\ Attaches accelerators (e.g. GPUs) to the {instance_type} instance(s). @@ -180,10 +180,10 @@ def Args(parser): @staticmethod def ValidateArgs(args): super(CreateBeta, CreateBeta).ValidateArgs(args) - if args.master_accelerator and 'type' not in args.master_accelerator: + if args.main_accelerator and 'type' not in args.main_accelerator: raise exceptions.InvalidArgumentException( - '--master-accelerator', 'accelerator type must be specified. ' - 'e.g. --master-accelerator type=nvidia-tesla-k80,count=2') + '--main-accelerator', 'accelerator type must be specified. ' + 'e.g. --main-accelerator type=nvidia-tesla-k80,count=2') if args.worker_accelerator and 'type' not in args.worker_accelerator: raise exceptions.InvalidArgumentException( '--worker-accelerator', 'accelerator type must be specified. ' diff --git a/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/__init__.py b/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/__init__.py index dad41229..adce236f 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/__init__.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/__init__.py @@ -53,7 +53,7 @@ class WorkflowTemplates(base.Group): To update managed cluster in a workflow template, run: - $ {command} set-managed-cluster my_template --num-masters 5 + $ {command} set-managed-cluster my_template --num-mains 5 To update cluster selector in a workflow template, run: diff --git a/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/set_managed_cluster.py b/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/set_managed_cluster.py index 16a23109..40f69b83 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/set_managed_cluster.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/dataproc/workflow_templates/set_managed_cluster.py @@ -69,7 +69,7 @@ def Args(parser): information on time formats. """) - for instance_type in ('master', 'worker'): + for instance_type in ('main', 'worker'): help_msg = """\ Attaches accelerators (e.g. GPUs) to the {instance_type} instance(s). diff --git a/google-cloud-sdk/.install/.backup/lib/surface/ml_engine/local/train.py b/google-cloud-sdk/.install/.backup/lib/surface/ml_engine/local/train.py index c425c471..665ecd3f 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/ml_engine/local/train.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/ml_engine/local/train.py @@ -98,7 +98,7 @@ def Run(self, args): retval = local_train.MakeProcess(args.module_name, package_root, args=user_args, - task_type='master') + task_type='main') # Don't raise an exception because the users will already see the message. # We want this to mimic calling the script directly as much as possible. self.exit_code = retval diff --git a/google-cloud-sdk/.install/.backup/lib/surface/source/repos/clone.py b/google-cloud-sdk/.install/.backup/lib/surface/source/repos/clone.py index 7ac73612..b3af932f 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/source/repos/clone.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/source/repos/clone.py @@ -49,7 +49,7 @@ class CloneGA(base.Command): $ {command} REPOSITORY_NAME DIRECTORY_NAME $ cd DIRECTORY_NAME ... create/edit files and create one or more commits ... - $ git push origin master + $ git push origin main """, } @@ -133,7 +133,7 @@ class CloneAlpha(CloneGA): $ {command} REPOSITORY_NAME DIRECTORY_NAME $ cd DIRECTORY_NAME ... create/edit files and create one or more commits ... - $ git push origin master + $ git push origin main """ @staticmethod diff --git a/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/create.py b/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/create.py index b3be8058..475be440 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/create.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/create.py @@ -85,11 +85,11 @@ def AddBaseArgs(parser): flags.AddMaintenanceWindowDay(parser) flags.AddMaintenanceWindowHour(parser) parser.add_argument( - '--master-instance-name', + '--main-instance-name', required=False, - help=('Name of the instance which will act as master in the ' + help=('Name of the instance which will act as main in the ' 'replication setup. The newly created instance will be a read ' - 'replica of the specified master instance.')) + 'replica of the specified main instance.')) flags.AddMemory(parser) parser.add_argument( '--pricing-plan', @@ -141,7 +141,7 @@ def AddBaseArgs(parser): def AddBetaArgs(parser): """Declare beta flag and positional arguments for this command parser.""" - flags.AddExternalMasterGroup(parser) + flags.AddExternalMainGroup(parser) flags.AddInstanceResizeLimit(parser) labels_util.AddCreateLabelsFlags(parser) @@ -171,36 +171,36 @@ def RunBaseCreateCommand(args, release_track): params={'project': properties.VALUES.core.project.GetOrFail}, collection='sql.instances') - # Get the region, tier, and database version from the master if these fields + # Get the region, tier, and database version from the main if these fields # are not specified. # TODO(b/64266672): Remove once API does not require these fields. - if args.IsSpecified('master_instance_name'): - master_instance_ref = client.resource_parser.Parse( - args.master_instance_name, + if args.IsSpecified('main_instance_name'): + main_instance_ref = client.resource_parser.Parse( + args.main_instance_name, params={'project': properties.VALUES.core.project.GetOrFail}, collection='sql.instances') try: - master_instance_resource = sql_client.instances.Get( + main_instance_resource = sql_client.instances.Get( sql_messages.SqlInstancesGetRequest( project=instance_ref.project, - instance=master_instance_ref.instance)) + instance=main_instance_ref.instance)) except apitools_exceptions.HttpError as error: # TODO(b/64292220): Remove once API gives helpful error message. - log.debug('operation : %s', str(master_instance_ref)) + log.debug('operation : %s', str(main_instance_ref)) exc = exceptions.HttpException(error) if resource_property.Get(exc.payload.content, resource_lex.ParseKey('error.errors[0].reason'), None) == 'notAuthorized': - msg = ('You are either not authorized to access the master instance or ' + msg = ('You are either not authorized to access the main instance or ' 'it does not exist.') raise exceptions.HttpException(msg) raise if not args.IsSpecified('region'): - args.region = master_instance_resource.region + args.region = main_instance_resource.region if not args.IsSpecified('database_version'): - args.database_version = master_instance_resource.databaseVersion - if not args.IsSpecified('tier') and master_instance_resource.settings: - args.tier = master_instance_resource.settings.tier + args.database_version = main_instance_resource.databaseVersion + if not args.IsSpecified('tier') and main_instance_resource.settings: + args.tier = main_instance_resource.settings.tier instance_resource = ( command_util.InstancesV1Beta4.ConstructCreateInstanceFromArgs( diff --git a/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/failover.py b/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/failover.py index d60f87a3..433c6d5e 100644 --- a/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/failover.py +++ b/google-cloud-sdk/.install/.backup/lib/surface/sql/instances/failover.py @@ -66,7 +66,7 @@ def Run(self, args): console_io.PromptContinue( message='Failover will be initiated. Existing connections to the ' - 'master instance will break and no new connection can be established ' + 'main instance will break and no new connection can be established ' 'during the failover.', default=True, cancel_on_no=True) diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/apitools/base/py/batch.py b/google-cloud-sdk/.install/.backup/lib/third_party/apitools/base/py/batch.py index ecb1ce01..e1739aaf 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/apitools/base/py/batch.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/apitools/base/py/batch.py @@ -176,7 +176,7 @@ def Add(self, service, method, request, global_params=None): method_config, request, global_params=global_params, upload_config=upload_config) - # Create the request and add it to our master list. + # Create the request and add it to our main list. api_request = self.ApiCall( http_request, self.retryable_codes, service, method_config) self.api_requests.append(api_request) diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdataset.py b/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdataset.py index db266f2f..403996c0 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdataset.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdataset.py @@ -174,7 +174,7 @@ def __ne__(self, other): def to_text(self, name=None, origin=None, relativize=True, override_rdclass=None, **kw): - """Convert the rdataset into DNS master file format. + """Convert the rdataset into DNS main file format. @see: L{dns.name.Name.choose_relativity} for more information on how I{origin} and I{relativize} determine the way names diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdtypes/ANY/SOA.py b/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdtypes/ANY/SOA.py index cc0098e8..b363af51 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdtypes/ANY/SOA.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/dns/rdtypes/ANY/SOA.py @@ -24,7 +24,7 @@ class SOA(dns.rdata.Rdata): """SOA record - @ivar mname: the SOA MNAME (master name) field + @ivar mname: the SOA MNAME (main name) field @type mname: dns.name.Name object @ivar rname: the SOA RNAME (responsible name) field @type rname: dns.name.Name object diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/dns/rrset.py b/google-cloud-sdk/.install/.backup/lib/third_party/dns/rrset.py index d0f8f937..e2dbc5d1 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/dns/rrset.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/dns/rrset.py @@ -88,7 +88,7 @@ def match(self, name, rdclass, rdtype, covers, deleting=None): return True def to_text(self, origin=None, relativize=True, **kw): - """Convert the RRset into DNS master file format. + """Convert the RRset into DNS main file format. @see: L{dns.name.Name.choose_relativity} for more information on how I{origin} and I{relativize} determine the way names diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/dns/tokenizer.py b/google-cloud-sdk/.install/.backup/lib/third_party/dns/tokenizer.py index 04b98254..966111ea 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/dns/tokenizer.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/dns/tokenizer.py @@ -13,7 +13,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -"""Tokenize DNS master file format""" +"""Tokenize DNS main file format""" from io import StringIO import sys @@ -50,7 +50,7 @@ class UngetBufferFull(dns.exception.DNSException): class Token(object): - """A DNS master file format token. + """A DNS main file format token. @ivar ttype: The token type @type ttype: int @@ -161,7 +161,7 @@ def __getitem__(self, i): class Tokenizer(object): - """A DNS master file format tokenizer. + """A DNS main file format tokenizer. A token is a (type, value) tuple, where I{type} is an int, and I{value} is a string. The valid types are EOF, EOL, WHITESPACE, diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/dns/zone.py b/google-cloud-sdk/.install/.backup/lib/third_party/dns/zone.py index 468618f6..dee22797 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/dns/zone.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/dns/zone.py @@ -583,9 +583,9 @@ def check_origin(self): raise NoNS -class _MasterReader(object): +class _MainReader(object): - """Read a DNS master file + """Read a DNS main file @ivar tok: The tokenizer @type tok: dns.tokenizer.Tokenizer object @@ -633,7 +633,7 @@ def _eat_line(self): break def _rr_line(self): - """Process one line from a DNS master file.""" + """Process one line from a DNS main file.""" # Name if self.current_origin is None: raise UnknownOrigin @@ -752,7 +752,7 @@ def _parse_modify(self, side): def _generate_line(self): # range lhs [ttl] [class] type rhs [ comment ] """Process one line containing the GENERATE statement from a DNS - master file.""" + main file.""" if self.current_origin is None: raise UnknownOrigin @@ -867,7 +867,7 @@ def _generate_line(self): rds.add(rd, ttl) def read(self): - """Read a DNS master file and build a zone object. + """Read a DNS main file and build a zone object. @raises dns.zone.NoSOA: No SOA RR was found at the zone origin @raises dns.zone.NoNS: No NS RRset was found at the zone origin @@ -932,7 +932,7 @@ def read(self): self._generate_line() else: raise dns.exception.SyntaxError( - "Unknown master file directive '" + c + "'") + "Unknown main file directive '" + c + "'") continue self.tok.unget(token) self._rr_line() @@ -951,12 +951,12 @@ def read(self): def from_text(text, origin=None, rdclass=dns.rdataclass.IN, relativize=True, zone_factory=Zone, filename=None, allow_include=False, check_origin=True): - """Build a zone object from a master file format string. + """Build a zone object from a main file format string. - @param text: the master file format input + @param text: the main file format input @type text: string. @param origin: The origin of the zone; if not specified, the first - $ORIGIN statement in the master file will determine the origin of the + $ORIGIN statement in the main file will determine the origin of the zone. @type origin: dns.name.Name object or string @param rdclass: The zone's rdata class; the default is class IN. @@ -985,7 +985,7 @@ def from_text(text, origin=None, rdclass=dns.rdataclass.IN, if filename is None: filename = '' tok = dns.tokenizer.Tokenizer(text, filename) - reader = _MasterReader(tok, origin, rdclass, relativize, zone_factory, + reader = _MainReader(tok, origin, rdclass, relativize, zone_factory, allow_include=allow_include, check_origin=check_origin) reader.read() @@ -995,12 +995,12 @@ def from_text(text, origin=None, rdclass=dns.rdataclass.IN, def from_file(f, origin=None, rdclass=dns.rdataclass.IN, relativize=True, zone_factory=Zone, filename=None, allow_include=True, check_origin=True): - """Read a master file and build a zone object. + """Read a main file and build a zone object. @param f: file or string. If I{f} is a string, it is treated as the name of a file to open. @param origin: The origin of the zone; if not specified, the first - $ORIGIN statement in the master file will determine the origin of the + $ORIGIN statement in the main file will determine the origin of the zone. @type origin: dns.name.Name object or string @param rdclass: The zone's rdata class; the default is class IN. diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/dulwich/repo.py b/google-cloud-sdk/.install/.backup/lib/third_party/dulwich/repo.py index d4f252bd..03b0609e 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/dulwich/repo.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/dulwich/repo.py @@ -790,8 +790,8 @@ def clone(self, target_path, mkdir=True, bare=False, b'refs/tags', self.refs.as_dict(b'refs/tags')) try: target.refs.add_if_new( - b'refs/heads/master', - self.refs[b'refs/heads/master']) + b'refs/heads/main', + self.refs[b'refs/heads/main']) except KeyError: pass @@ -876,7 +876,7 @@ def _init_maybe_bare(cls, path, bare): os.mkdir(os.path.join(path, *d)) DiskObjectStore.init(os.path.join(path, OBJECTDIR)) ret = cls(path) - ret.refs.set_symbolic_ref(b'HEAD', b"refs/heads/master") + ret.refs.set_symbolic_ref(b'HEAD', b"refs/heads/main") ret._init_files(bare) return ret diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/ml_sdk/cloud/ml/io/coders.py b/google-cloud-sdk/.install/.backup/lib/third_party/ml_sdk/cloud/ml/io/coders.py index aa284b2f..8a2d3eeb 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/ml_sdk/cloud/ml/io/coders.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/ml_sdk/cloud/ml/io/coders.py @@ -380,7 +380,7 @@ def __init__(self, scale_tier=None, hyperparameters=None, region=None, - master_type=None, + main_type=None, worker_type=None, ps_type=None, worker_count=None, @@ -405,7 +405,7 @@ def __init__(self, scale_tier: Google Cloud ML tier to run in. hyperparameters: (Optional) Hyperparameter config to use for the job. region: (Optional) Google Cloud region in which to run. - master_type: Master type to use with a CUSTOM scale tier. + main_type: Main type to use with a CUSTOM scale tier. worker_type: Worker type to use with a CUSTOM scale tier. ps_type: Parameter Server type to use with a CUSTOM scale tier. worker_count: Worker count to use with a CUSTOM scale tier. @@ -422,7 +422,7 @@ def __init__(self, self.scale_tier = scale_tier self.hyperparameters = hyperparameters self.region = region - self.master_type = master_type + self.main_type = main_type self.worker_type = worker_type self.ps_type = ps_type self.worker_count = worker_count @@ -446,7 +446,7 @@ def copy(self): def __eq__(self, o): for f in ['parent', 'job_name', 'job_args', 'package_uris', 'python_module', 'timeout', 'polling_interval', 'endpoint', 'hyperparameters', - 'scale_tier', 'worker_type', 'ps_type', 'master_type', 'region', + 'scale_tier', 'worker_type', 'ps_type', 'main_type', 'region', 'ps_count', 'worker_count', 'runtime_version']: if getattr(self, f) != getattr(o, f): return False diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/pkg_resources/__init__.py b/google-cloud-sdk/.install/.backup/lib/third_party/pkg_resources/__init__.py index e33de0e7..a389aa29 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/pkg_resources/__init__.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/pkg_resources/__init__.py @@ -638,9 +638,9 @@ def __init__(self, entries=None): self.add_entry(entry) @classmethod - def _build_master(cls): + def _build_main(cls): """ - Prepare the master working set. + Prepare the main working set. """ ws = cls() try: @@ -3028,9 +3028,9 @@ def _initialize(g=globals()): @_call_aside -def _initialize_master_working_set(): +def _initialize_main_working_set(): """ - Prepare the master working set and make the ``require()`` + Prepare the main working set and make the ``require()`` API available. This function has explicit effects on the global state @@ -3040,7 +3040,7 @@ def _initialize_master_working_set(): Invocation by other packages is unsupported and done at their own risk. """ - working_set = WorkingSet._build_master() + working_set = WorkingSet._build_main() _declare_state('object', working_set=working_set) require = working_set.require diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/formatters/_mapping.py b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/formatters/_mapping.py index 7bb3e71c..08f703d6 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/formatters/_mapping.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/formatters/_mapping.py @@ -68,7 +68,7 @@ content = fp.read() # replace crnl to nl for Windows. # - # Note that, originally, contributers should keep nl of master + # Note that, originally, contributers should keep nl of main # repository, for example by using some kind of automatic # management EOL, like `EolExtension # `. diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_lasso_builtins.py b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_lasso_builtins.py index d950cbe8..5bf0df72 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_lasso_builtins.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_lasso_builtins.py @@ -1325,7 +1325,7 @@ 'mongo_query_none', 'mongo_query_oplog_replay', 'mongo_query_partial', - 'mongo_query_slave_ok', + 'mongo_query_subordinate_ok', 'mongo_query_tailable_cursor', 'mongo_remove_none', 'mongo_remove_single_remove', @@ -1534,7 +1534,7 @@ 'sys_listunboundmethods', 'sys_loadlibrary', 'sys_lrand48', - 'sys_masterhomepath', + 'sys_mainhomepath', 'sys_mrand48', 'sys_nrand48', 'sys_pid_exec', diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_mapping.py b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_mapping.py index ea54241c..de7de2c7 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_mapping.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_mapping.py @@ -483,7 +483,7 @@ content = fp.read() # replace crnl to nl for Windows. # - # Note that, originally, contributers should keep nl of master + # Note that, originally, contributers should keep nl of main # repository, for example by using some kind of automatic # management EOL, like `EolExtension # `. diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_php_builtins.py b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_php_builtins.py index fec3286a..dd484e44 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_php_builtins.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/_php_builtins.py @@ -59,20 +59,20 @@ 'mysqli_client_encoding', 'mysqli_connect', 'mysqli_disable_rpl_parse', - 'mysqli_enable_reads_from_master', + 'mysqli_enable_reads_from_main', 'mysqli_enable_rpl_parse', 'mysqli_escape_string', 'mysqli_execute', 'mysqli_fetch', 'mysqli_get_cache_stats', 'mysqli_get_metadata', - 'mysqli_master_query', + 'mysqli_main_query', 'mysqli_param_count', 'mysqli_report', 'mysqli_rpl_parse_enabled', 'mysqli_rpl_probe', 'mysqli_send_long_data', - 'mysqli_slave_query'), + 'mysqli_subordinate_query'), 'Apache': ('apache_child_terminate', 'apache_get_modules', 'apache_get_version', @@ -1950,11 +1950,11 @@ 'maxdb_connect', 'maxdb_data_seek', 'maxdb_debug', - 'maxdb_disable_reads_from_master', + 'maxdb_disable_reads_from_main', 'maxdb_disable_rpl_parse', 'maxdb_dump_debug_info', 'maxdb_embedded_connect', - 'maxdb_enable_reads_from_master', + 'maxdb_enable_reads_from_main', 'maxdb_enable_rpl_parse', 'maxdb_errno', 'maxdb_error', @@ -1984,7 +1984,7 @@ 'maxdb_init', 'maxdb_insert_id', 'maxdb_kill', - 'maxdb_master_query', + 'maxdb_main_query', 'maxdb_more_results', 'maxdb_multi_query', 'maxdb_next_result', @@ -4371,7 +4371,7 @@ 'yp_errno', 'yp_first', 'yp_get_default_domain', - 'yp_master', + 'yp_main', 'yp_match', 'yp_next', 'yp_order'), diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/esoteric.py b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/esoteric.py index 793c28be..97dec67e 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/esoteric.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/pygments/lexers/esoteric.py @@ -186,7 +186,7 @@ class CapDLLexer(RegexLexer): (words(('asid', 'addr', 'badge', 'cached', 'dom', 'domainID', 'elf', 'fault_ep', 'G', 'guard', 'guard_size', 'init', 'ip', 'prio', 'sp', 'R', 'RG', 'RX', 'RW', 'RWG', 'RWX', 'W', - 'WG', 'WX', 'level', 'masked', 'master_reply', 'paddr', + 'WG', 'WX', 'level', 'masked', 'main_reply', 'paddr', 'ports', 'reply', 'uncached'), suffix=r'\b'), Keyword.Reserved), diff --git a/google-cloud-sdk/.install/.backup/lib/third_party/setuptools/command/easy_install.py b/google-cloud-sdk/.install/.backup/lib/third_party/setuptools/command/easy_install.py index d3eabfc3..4d562940 100644 --- a/google-cloud-sdk/.install/.backup/lib/third_party/setuptools/command/easy_install.py +++ b/google-cloud-sdk/.install/.backup/lib/third_party/setuptools/command/easy_install.py @@ -1733,7 +1733,7 @@ def update_dist_caches(dist_path, fix_zipimporter_caches): # There are several other known sources of stale zipimport.zipimporter # instances that we do not clear here, but might if ever given a reason to # do so: - # * Global setuptools pkg_resources.working_set (a.k.a. 'master working + # * Global setuptools pkg_resources.working_set (a.k.a. 'main working # set') may contain distributions which may in turn contain their # zipimport.zipimporter loaders. # * Several zipimport.zipimporter loaders held by local variables further diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/addlhelp/naming.py b/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/addlhelp/naming.py index 8f278cd8..9b109219 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/addlhelp/naming.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/addlhelp/naming.py @@ -94,8 +94,8 @@ user who creates the bucket, so the user who creates the bucket must also be verified as an owner or manager of the domain. - To verify as the owner or manager of a domain, use the Google Webmaster - Tools verification process. The Webmaster Tools verification process + To verify as the owner or manager of a domain, use the Google Webmain + Tools verification process. The Webmain Tools verification process provides three methods for verifying an owner or manager of a domain: 1. Adding a special Meta tag to a site's homepage. diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/commands/notification.py b/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/commands/notification.py index a5d9def5..ab2fd552 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/commands/notification.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/commands/notification.py @@ -334,7 +334,7 @@ Service Account authentication and that the Service Account's project is authorized for the application URL. Notification endpoint URLs must also be whitelisted in your Cloud Console project. To do that, the domain must also be -verified using Google Webmaster Tools. For instructions, please see +verified using Google Webmain Tools. For instructions, please see `Notification Authorization `_. """ diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/ui_controller.py b/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/ui_controller.py index f09987b9..5f14a276 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/ui_controller.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/gslib/ui_controller.py @@ -1048,7 +1048,7 @@ def Call(self, status_message, stream, cur_time=None): class MainThreadUIQueue(object): - """Handles status display and processing in the main thread / master process. + """Handles status display and processing in the main thread / main process. This class emulates a queue to cover main-thread activity before or after Apply, as well as for the single-threaded, single-process case, i.e., diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/apitools/base/py/batch.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/apitools/base/py/batch.py index f925ccfe..c1c2001d 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/apitools/base/py/batch.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/apitools/base/py/batch.py @@ -176,7 +176,7 @@ def Add(self, service, method, request, global_params=None): method_config, request, global_params=global_params, upload_config=upload_config) - # Create the request and add it to our master list. + # Create the request and add it to our main list. api_request = self.ApiCall( http_request, self.retryable_codes, service, method_config) self.api_requests.append(api_request) diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/run_pylint.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/run_pylint.py index c7e532ec..af55c21e 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/run_pylint.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/apitools/run_pylint.py @@ -118,9 +118,9 @@ def get_files_for_linting(allow_limited=True, diff_base=None): uses a specific commit or branch (a so-called diff base) to compare against for changed files. (This requires ``allow_limited=True``.) - To speed up linting on Travis pull requests against master, we manually - set the diff base to origin/master. We don't do this on non-pull requests - since origin/master will be equivalent to the currently checked out code. + To speed up linting on Travis pull requests against main, we manually + set the diff base to origin/main. We don't do this on non-pull requests + since origin/main will be equivalent to the currently checked out code. One could potentially use ${TRAVIS_COMMIT_RANGE} to find a diff base but this value is not dependable. @@ -133,14 +133,14 @@ def get_files_for_linting(allow_limited=True, diff_base=None): linted. """ if os.getenv('TRAVIS') == 'true': - # In travis, don't default to master. + # In travis, don't default to main. diff_base = None - if (os.getenv('TRAVIS_BRANCH') == 'master' and + if (os.getenv('TRAVIS_BRANCH') == 'main' and os.getenv('TRAVIS_PULL_REQUEST') != 'false'): - # In the case of a pull request into master, we want to - # diff against HEAD in master. - diff_base = 'origin/master' + # In the case of a pull request into main, we want to + # diff against HEAD in main. + diff_base = 'origin/main' if diff_base is not None and allow_limited: result = subprocess.check_output(['git', 'diff', '--name-only', diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/argcomplete/docs/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/argcomplete/docs/conf.py index ea2ca4a3..67d2bf72 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/argcomplete/docs/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/argcomplete/docs/conf.py @@ -36,8 +36,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'argcomplete' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py index 0f4dc9c7..3a5ce45e 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py @@ -118,10 +118,10 @@ def create_job(self, pipeline_id=None, input_name=None, output=None, :type playlists: list :param playlists: If you specify a preset in `PresetId` for which the value of `Container` is ts (MPEG-TS), Playlists contains - information about the master playlists that you want Elastic + information about the main playlists that you want Elastic Transcoder to create. - We recommend that you create only one master playlist. The maximum - number of master playlists in a job is 30. + We recommend that you create only one main playlist. The maximum + number of main playlists in a job is 30. """ uri = '/2012-09-25/jobs' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/connection.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/connection.py index 7afc4e07..870a9bdc 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/connection.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/connection.py @@ -408,8 +408,8 @@ def modify_instance_groups(self, instance_group_ids, new_sizes): def run_jobflow(self, name, log_uri=None, ec2_keyname=None, availability_zone=None, - master_instance_type='m1.small', - slave_instance_type='m1.small', num_instances=1, + main_instance_type='m1.small', + subordinate_instance_type='m1.small', num_instances=1, action_on_failure='TERMINATE_JOB_FLOW', keep_alive=False, enable_debugging=False, hadoop_version=None, @@ -436,11 +436,11 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, :type availability_zone: str :param availability_zone: EC2 availability zone of the cluster - :type master_instance_type: str - :param master_instance_type: EC2 instance type of the master + :type main_instance_type: str + :param main_instance_type: EC2 instance type of the main - :type slave_instance_type: str - :param slave_instance_type: EC2 instance type of the slave nodes + :type subordinate_instance_type: str + :param subordinate_instance_type: EC2 instance type of the subordinate nodes :type num_instances: int :param num_instances: Number of instances in the Hadoop cluster @@ -471,7 +471,7 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, :param instance_groups: Optional list of instance groups to use when creating this job. NB: When provided, this argument supersedes num_instances - and master/slave_instance_type. + and main/subordinate_instance_type. :type ami_version: str :param ami_version: Amazon Machine Image (AMI) version to use @@ -526,15 +526,15 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, params.update(common_params) # NB: according to the AWS API's error message, we must - # "configure instances either using instance count, master and - # slave instance type or instance groups but not both." + # "configure instances either using instance count, main and + # subordinate instance type or instance groups but not both." # # Thus we switch here on the truthiness of instance_groups. if not instance_groups: # Instance args (the common case) instance_params = self._build_instance_count_and_type_args( - master_instance_type, - slave_instance_type, + main_instance_type, + subordinate_instance_type, num_instances) params.update(instance_params) else: @@ -721,15 +721,15 @@ def _build_instance_common_args(self, ec2_keyname, availability_zone, return params - def _build_instance_count_and_type_args(self, master_instance_type, - slave_instance_type, num_instances): + def _build_instance_count_and_type_args(self, main_instance_type, + subordinate_instance_type, num_instances): """ - Takes a master instance type (string), a slave instance type + Takes a main instance type (string), a subordinate instance type (string), and a number of instances. Returns a comparable dict for use in making a RunJobFlow request. """ - params = {'Instances.MasterInstanceType': master_instance_type, - 'Instances.SlaveInstanceType': slave_instance_type, + params = {'Instances.MainInstanceType': main_instance_type, + 'Instances.SubordinateInstanceType': subordinate_instance_type, 'Instances.InstanceCount': num_instances} return params diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/step.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/step.py index de6835fb..35cb8bbf 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/step.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/emr/step.py @@ -132,7 +132,7 @@ def __init__(self, name, mapper, reducer=None, combiner=None, :param output: The output uri :type jar: str :param jar: The hadoop streaming jar. This can be either a local - path on the master node, or an s3:// URI. + path on the main node, or an s3:// URI. """ self.name = name self.mapper = mapper diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/kms/layer1.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/kms/layer1.py index 88ea2e0f..3fbc059d 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/kms/layer1.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/kms/layer1.py @@ -130,7 +130,7 @@ def _required_auth_capability(self): def create_alias(self, alias_name, target_key_id): """ - Creates a display name for a customer master key. An alias can + Creates a display name for a customer main key. An alias can be used to identify a key and should be unique. The console enforces a one-to-one mapping between the alias and a key. An alias name can contain only alphanumeric characters, forward @@ -174,7 +174,7 @@ def create_grant(self, key_id, grantee_principal, #. RevokeGrant :type key_id: string - :param key_id: A unique key identifier for a customer master key. This + :param key_id: A unique key identifier for a customer main key. This value can be a globally unique identifier, an ARN, or an alias. :type grantee_principal: string @@ -222,7 +222,7 @@ def create_grant(self, key_id, grantee_principal, def create_key(self, policy=None, description=None, key_usage=None): """ - Creates a customer master key. Customer master keys can be + Creates a customer main key. Customer main keys can be used to encrypt small amounts of data (less than 4K) directly, but they are most commonly used to encrypt or envelope data keys that are then used to encrypt customer data. For more @@ -306,10 +306,10 @@ def delete_alias(self, alias_name): def describe_key(self, key_id): """ Provides detailed information about the specified customer - master key. + main key. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be described. This can be an ARN, an alias, or a globally unique identifier. @@ -323,7 +323,7 @@ def disable_key(self, key_id): Marks a key as disabled, thereby preventing its use. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be disabled. This can be an ARN, an alias, or a globally unique identifier. @@ -337,7 +337,7 @@ def disable_key_rotation(self, key_id): Disables rotation of the specified key. :type key_id: string - :param key_id: Unique identifier of the customer master key for which + :param key_id: Unique identifier of the customer main key for which rotation is to be disabled. This can be an ARN, an alias, or a globally unique identifier. @@ -352,7 +352,7 @@ def enable_key(self, key_id): have up to 25 enabled keys at one time. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be enabled. This can be an ARN, an alias, or a globally unique identifier. @@ -363,10 +363,10 @@ def enable_key(self, key_id): def enable_key_rotation(self, key_id): """ - Enables rotation of the specified customer master key. + Enables rotation of the specified customer main key. :type key_id: string - :param key_id: Unique identifier of the customer master key for which + :param key_id: Unique identifier of the customer main key for which rotation is to be enabled. This can be an ARN, an alias, or a globally unique identifier. @@ -378,11 +378,11 @@ def enable_key_rotation(self, key_id): def encrypt(self, key_id, plaintext, encryption_context=None, grant_tokens=None): """ - Encrypts plaintext into ciphertext by using a customer master + Encrypts plaintext into ciphertext by using a customer main key. :type key_id: string - :param key_id: Unique identifier of the customer master. This can be an + :param key_id: Unique identifier of the customer main. This can be an ARN, an alias, or the Key ID. :type plaintext: blob @@ -420,7 +420,7 @@ def generate_data_key(self, key_id, encryption_context=None, grant_tokens=None): """ Generates a secure data key. Data keys are used to encrypt and - decrypt data. They are wrapped by customer master keys. + decrypt data. They are wrapped by customer main keys. :type key_id: string :param key_id: Unique identifier of the key. This can be an ARN, an @@ -472,7 +472,7 @@ def generate_data_key_without_plaintext(self, key_id, number_of_bytes=None, grant_tokens=None): """ - Returns a key wrapped by a customer master key without the + Returns a key wrapped by a customer main key without the plaintext copy of that key. To retrieve the plaintext, see GenerateDataKey. @@ -651,7 +651,7 @@ def list_key_policies(self, key_id, limit=None, marker=None): def list_keys(self, limit=None, marker=None): """ - Lists the customer master keys. + Lists the customer main keys. :type limit: integer :param limit: Specify this parameter only when paginating results to @@ -702,7 +702,7 @@ def re_encrypt(self, ciphertext_blob, destination_key_id, source_encryption_context=None, destination_encryption_context=None, grant_tokens=None): """ - Encrypts data on the server side with a new customer master + Encrypts data on the server side with a new customer main key without exposing the plaintext of the data on the client side. The data is first decrypted and then encrypted. This operation can also be used to change the encryption context of diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/opsworks/layer1.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/opsworks/layer1.py index 8894d1c3..e007856c 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/opsworks/layer1.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/opsworks/layer1.py @@ -2124,7 +2124,7 @@ def register_rds_db_instance(self, stack_id, rds_db_instance_arn, :param rds_db_instance_arn: The Amazon RDS instance's ARN. :type db_user: string - :param db_user: The database's master user name. + :param db_user: The database's main user name. :type db_password: string :param db_password: The database password. @@ -2785,7 +2785,7 @@ def update_rds_db_instance(self, rds_db_instance_arn, db_user=None, :param rds_db_instance_arn: The Amazon RDS instance's ARN. :type db_user: string - :param db_user: The master user name. + :param db_user: The main user name. :type db_password: string :param db_password: The database password. diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py index 82c2822e..21fafd24 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py @@ -88,7 +88,7 @@ def load_boto(self): if update.find(':') >= 0: method, version = update.split(':') else: - version = 'master' + version = 'main' self.run('git checkout %s' % version, cwd=location) else: # first remove the symlink needed when running from subversion diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/__init__.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/__init__.py index 9e9132c9..14ed7fa8 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/__init__.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/__init__.py @@ -138,8 +138,8 @@ def create_dbinstance(self, id, allocated_storage, instance_class, - master_username, - master_password, + main_username, + main_password, port=3306, engine='MySQL5.1', db_name=None, @@ -168,8 +168,8 @@ def create_dbinstance(self, # security_groups should be db_security_groups according to API docs but has been left # security_groups for backwards compatibility # - # master_password should be master_user_password according to API docs but has been left - # master_password for backwards compatibility + # main_password should be main_user_password according to API docs but has been left + # main_password for backwards compatibility # # instance_class should be db_instance_class according to API docs but has been left # instance_class for backwards compatibility @@ -222,8 +222,8 @@ def create_dbinstance(self, * sqlserver-web * postgres - :type master_username: str - :param master_username: Name of master user for the DBInstance. + :type main_username: str + :param main_username: Name of main user for the DBInstance. * MySQL must be; - 1--16 alphanumeric characters @@ -240,8 +240,8 @@ def create_dbinstance(self, - first character must be a letter - cannot be a reserver SQL Server word - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. * MySQL must be 8--41 alphanumeric characters @@ -398,8 +398,8 @@ def create_dbinstance(self, # engine => Engine # engine_version => EngineVersion # license_model => LicenseModel - # master_username => MasterUsername - # master_user_password => MasterUserPassword + # main_username => MainUsername + # main_user_password => MainUserPassword # multi_az => MultiAZ # option_group_name => OptionGroupName # port => Port @@ -423,8 +423,8 @@ def create_dbinstance(self, 'EngineVersion': engine_version, 'Iops': iops, 'LicenseModel': license_model, - 'MasterUsername': master_username, - 'MasterUserPassword': master_password, + 'MainUsername': main_username, + 'MainUserPassword': main_password, 'MultiAZ': str(multi_az).lower() if multi_az else None, 'OptionGroupName': option_group_name, 'Port': port, @@ -562,7 +562,7 @@ def promote_read_replica(self, id, def modify_dbinstance(self, id, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -593,8 +593,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -680,8 +680,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, self.build_list_params(params, l, 'VpcSecurityGroupIds.member') if preferred_maintenance_window: params['PreferredMaintenanceWindow'] = preferred_maintenance_window - if master_password: - params['MasterUserPassword'] = master_password + if main_password: + params['MainUserPassword'] = main_password if allocated_storage: params['AllocatedStorage'] = allocated_storage if instance_class: diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbinstance.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbinstance.py index 6a638510..e0acf277 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbinstance.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbinstance.py @@ -47,7 +47,7 @@ class DBInstance(object): in status "available". :ivar instance_class: Contains the name of the compute and memory capacity class of the DB Instance. - :ivar master_username: The username that is set as master username + :ivar main_username: The username that is set as main username at creation time. :ivar parameter_groups: Provides the list of DB Parameter Groups applied to this DB Instance. @@ -98,7 +98,7 @@ def __init__(self, connection=None, id=None): self.auto_minor_version_upgrade = None self.endpoint = None self.instance_class = None - self.master_username = None + self.main_username = None self.parameter_groups = [] self.security_groups = [] self.read_replica_dbinstance_identifiers = [] @@ -172,8 +172,8 @@ def endElement(self, name, value, connection): self.auto_minor_version_upgrade = value.lower() == 'true' elif name == 'DBInstanceClass': self.instance_class = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'Port': if self._in_endpoint: self._port = int(value) @@ -293,7 +293,7 @@ def stop(self, skip_final_snapshot=False, final_snapshot_id=''): def modify(self, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -318,8 +318,8 @@ def modify(self, param_group=None, security_groups=None, UTC) during which maintenance can occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -386,7 +386,7 @@ def modify(self, param_group=None, security_groups=None, param_group, security_groups, preferred_maintenance_window, - master_password, + main_password, allocated_storage, instance_class, backup_retention_period, diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py index 16d8125b..35ecbd52 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py @@ -34,10 +34,10 @@ class DBSnapshot(object): :ivar id: Specifies the identifier for the DB Snapshot (DBSnapshotIdentifier) :ivar instance_create_time: Specifies the time (UTC) when the snapshot was taken :ivar instance_id: Specifies the the DBInstanceIdentifier of the DB Instance this DB Snapshot was created from (DBInstanceIdentifier) - :ivar master_username: Provides the master username for the DB Instance + :ivar main_username: Provides the main username for the DB Instance :ivar port: Specifies the port that the database engine was listening on at the time of the snapshot :ivar snapshot_create_time: Provides the time (UTC) when the snapshot was taken - :ivar status: Specifies the status of this DB Snapshot. Possible values are [ available, backing-up, creating, deleted, deleting, failed, modifying, rebooting, resetting-master-credentials ] + :ivar status: Specifies the status of this DB Snapshot. Possible values are [ available, backing-up, creating, deleted, deleting, failed, modifying, rebooting, resetting-main-credentials ] :ivar iops: Specifies the Provisioned IOPS (I/O operations per second) value of the DB instance at the time of the snapshot. :ivar option_group_name: Provides the option group name for the DB snapshot. :ivar percent_progress: The percentage of the estimated data that has been transferred. @@ -56,7 +56,7 @@ def __init__(self, connection=None, id=None): self.port = None self.status = None self.availability_zone = None - self.master_username = None + self.main_username = None self.allocated_storage = None self.instance_id = None self.availability_zone = None @@ -93,8 +93,8 @@ def endElement(self, name, value, connection): self.status = value elif name == 'AvailabilityZone': self.availability_zone = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'AllocatedStorage': self.allocated_storage = int(value) elif name == 'SnapshotTime': diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds2/layer1.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds2/layer1.py index bbe5a778..9ad772f8 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds2/layer1.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/rds2/layer1.py @@ -321,8 +321,8 @@ def copy_db_snapshot(self, source_db_snapshot_identifier, path='/', params=params) def create_db_instance(self, db_instance_identifier, allocated_storage, - db_instance_class, engine, master_username, - master_user_password, db_name=None, + db_instance_class, engine, main_username, + main_user_password, db_name=None, db_security_groups=None, vpc_security_group_ids=None, availability_zone=None, db_subnet_group_name=None, @@ -417,9 +417,9 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, Valid Values: `MySQL` | `oracle-se1` | `oracle-se` | `oracle-ee` | `sqlserver-ee` | `sqlserver-se` | `sqlserver-ex` | `sqlserver-web` - :type master_username: string - :param master_username: - The name of master user for the client DB instance. + :type main_username: string + :param main_username: + The name of main user for the client DB instance. **MySQL** @@ -452,8 +452,8 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, + First character must be a letter. + Cannot be a reserved word for the chosen database engine. - :type master_user_password: string - :param master_user_password: The password for the master database user. + :type main_user_password: string + :param main_user_password: The password for the main database user. Can be any printable ASCII character except "/", '"', or "@". Type: String @@ -536,7 +536,7 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, + Must be a value from 0 to 8 - + Cannot be set to 0 if the DB instance is a master instance with read + + Cannot be set to 0 if the DB instance is a main instance with read replicas :type preferred_backup_window: string @@ -656,8 +656,8 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, 'AllocatedStorage': allocated_storage, 'DBInstanceClass': db_instance_class, 'Engine': engine, - 'MasterUsername': master_username, - 'MasterUserPassword': master_user_password, + 'MainUsername': main_username, + 'MainUserPassword': main_user_password, } if db_name is not None: params['DBName'] = db_name @@ -2488,7 +2488,7 @@ def modify_db_instance(self, db_instance_identifier, allocated_storage=None, db_instance_class=None, db_security_groups=None, vpc_security_group_ids=None, - apply_immediately=None, master_user_password=None, + apply_immediately=None, main_user_password=None, db_parameter_group_name=None, backup_retention_period=None, preferred_backup_window=None, @@ -2616,14 +2616,14 @@ def modify_db_instance(self, db_instance_identifier, Default: `False` - :type master_user_password: string - :param master_user_password: - The new password for the DB instance master user. Can be any printable + :type main_user_password: string + :param main_user_password: + The new password for the DB instance main user. Can be any printable ASCII character except "/", '"', or "@". Changing this parameter does not result in an outage and the change is asynchronously applied as soon as possible. Between the time of the - request and the completion of the request, the `MasterUserPassword` + request and the completion of the request, the `MainUserPassword` element exists in the `PendingModifiedValues` element of the operation response. @@ -2634,7 +2634,7 @@ def modify_db_instance(self, db_instance_identifier, characters (SQL Server). Amazon RDS API actions never return the password, so this action - provides a way to regain access to a master instance user if the + provides a way to regain access to a main instance user if the password is lost. :type db_parameter_group_name: string @@ -2668,7 +2668,7 @@ def modify_db_instance(self, db_instance_identifier, + Must be a value from 0 to 8 - + Cannot be set to 0 if the DB instance is a master instance with read + + Cannot be set to 0 if the DB instance is a main instance with read replicas or if the DB instance is a read replica :type preferred_backup_window: string @@ -2820,8 +2820,8 @@ def modify_db_instance(self, db_instance_identifier, if apply_immediately is not None: params['ApplyImmediately'] = str( apply_immediately).lower() - if master_user_password is not None: - params['MasterUserPassword'] = master_user_password + if main_user_password is not None: + params['MainUserPassword'] = main_user_password if db_parameter_group_name is not None: params['DBParameterGroupName'] = db_parameter_group_name if backup_retention_period is not None: diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/redshift/layer1.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/redshift/layer1.py index be1529fd..46390418 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/redshift/layer1.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/boto/redshift/layer1.py @@ -310,8 +310,8 @@ def copy_cluster_snapshot(self, source_snapshot_identifier, verb='POST', path='/', params=params) - def create_cluster(self, cluster_identifier, node_type, master_username, - master_user_password, db_name=None, cluster_type=None, + def create_cluster(self, cluster_identifier, node_type, main_username, + main_user_password, db_name=None, cluster_type=None, cluster_security_groups=None, vpc_security_group_ids=None, cluster_subnet_group_name=None, @@ -391,9 +391,9 @@ def create_cluster(self, cluster_identifier, node_type, master_username, Valid Values: `dw1.xlarge` | `dw1.8xlarge` | `dw2.large` | `dw2.8xlarge`. - :type master_username: string - :param master_username: - The user name associated with the master user account for the cluster + :type main_username: string + :param main_username: + The user name associated with the main user account for the cluster that is being created. Constraints: @@ -404,9 +404,9 @@ def create_cluster(self, cluster_identifier, node_type, master_username, + Cannot be a reserved word. A list of reserved words can be found in `Reserved Words`_ in the Amazon Redshift Database Developer Guide. - :type master_user_password: string - :param master_user_password: - The password associated with the master user account for the cluster + :type main_user_password: string + :param main_user_password: + The password associated with the main user account for the cluster that is being created. Constraints: @@ -573,8 +573,8 @@ def create_cluster(self, cluster_identifier, node_type, master_username, params = { 'ClusterIdentifier': cluster_identifier, 'NodeType': node_type, - 'MasterUsername': master_username, - 'MasterUserPassword': master_user_password, + 'MainUsername': main_username, + 'MainUserPassword': main_user_password, } if db_name is not None: params['DBName'] = db_name @@ -2253,7 +2253,7 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, node_type=None, number_of_nodes=None, cluster_security_groups=None, vpc_security_group_ids=None, - master_user_password=None, + main_user_password=None, cluster_parameter_group_name=None, automated_snapshot_retention_period=None, preferred_maintenance_window=None, @@ -2264,7 +2264,7 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, """ Modifies the settings for a cluster. For example, you can add another security or parameter group, update the preferred - maintenance window, or change the master user password. + maintenance window, or change the main user password. Resetting a cluster password or modifying the security groups associated with a cluster do not need a reboot. However, modifying a parameter group requires a reboot for parameters @@ -2345,11 +2345,11 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, :param vpc_security_group_ids: A list of virtual private cloud (VPC) security groups to be associated with the cluster. - :type master_user_password: string - :param master_user_password: - The new password for the cluster master user. This change is + :type main_user_password: string + :param main_user_password: + The new password for the cluster main user. This change is asynchronously applied as soon as possible. Between the time of the - request and the completion of the request, the `MasterUserPassword` + request and the completion of the request, the `MainUserPassword` element exists in the `PendingModifiedValues` element of the operation response. @@ -2464,8 +2464,8 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, self.build_list_params(params, vpc_security_group_ids, 'VpcSecurityGroupIds.member') - if master_user_password is not None: - params['MasterUserPassword'] = master_user_password + if main_user_password is not None: + params['MainUserPassword'] = main_user_password if cluster_parameter_group_name is not None: params['ClusterParameterGroupName'] = cluster_parameter_group_name if automated_snapshot_retention_period is not None: diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py index 20963ed2..6d417e62 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py @@ -22,38 +22,38 @@ class PromoteReadReplicaTest(unittest.TestCase): def setUp(self): self.conn = RDSConnection() - self.masterDB_name = "boto-db-%s" % str(int(time.time())) - self.replicaDB_name = "replica-%s" % self.masterDB_name - self.renamedDB_name = "renamed-replica-%s" % self.masterDB_name + self.mainDB_name = "boto-db-%s" % str(int(time.time())) + self.replicaDB_name = "replica-%s" % self.mainDB_name + self.renamedDB_name = "renamed-replica-%s" % self.mainDB_name def tearDown(self): instances = self.conn.get_all_dbinstances() - for db in [self.masterDB_name, self.replicaDB_name, self.renamedDB_name]: + for db in [self.mainDB_name, self.replicaDB_name, self.renamedDB_name]: for i in instances: if i.id == db: self.conn.delete_dbinstance(db, skip_final_snapshot=True) def test_promote(self): print '--- running RDS promotion & renaming tests ---' - self.masterDB = self.conn.create_dbinstance(self.masterDB_name, 5, 'db.t1.micro', 'root', 'bototestpw') + self.mainDB = self.conn.create_dbinstance(self.mainDB_name, 5, 'db.t1.micro', 'root', 'bototestpw') - # Wait up to 15 minutes for the masterDB to become available - print '--- waiting for "%s" to become available ---' % self.masterDB_name + # Wait up to 15 minutes for the mainDB to become available + print '--- waiting for "%s" to become available ---' % self.mainDB_name wait_timeout = time.time() + (15 * 60) time.sleep(60) - instances = self.conn.get_all_dbinstances(self.masterDB_name) + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] while wait_timeout > time.time() and inst.status != 'available': time.sleep(15) - instances = self.conn.get_all_dbinstances(self.masterDB_name) + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] self.assertTrue(inst.status == 'available') - self.replicaDB = self.conn.create_dbinstance_read_replica(self.replicaDB_name, self.masterDB_name) + self.replicaDB = self.conn.create_dbinstance_read_replica(self.replicaDB_name, self.mainDB_name) # Wait up to 15 minutes for the replicaDB to become available print '--- waiting for "%s" to become available ---' % self.replicaDB_name @@ -92,8 +92,8 @@ def test_promote(self): self.assertTrue(inst.status == 'available') self.assertFalse(inst.status_infos) - # Verify that the master no longer has any read replicas - instances = self.conn.get_all_dbinstances(self.masterDB_name) + # Verify that the main no longer has any read replicas + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] self.assertFalse(inst.read_replica_dbinstance_identifiers) @@ -101,7 +101,7 @@ def test_promote(self): self.renamedDB = self.conn.modify_dbinstance(self.replicaDB_name, new_instance_id=self.renamedDB_name, apply_immediately=True) - # Wait up to 15 minutes for the masterDB to become available + # Wait up to 15 minutes for the mainDB to become available print '--- waiting for "%s" to exist ---' % self.renamedDB_name wait_timeout = time.time() + (15 * 60) diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py index 82d8193b..7830636d 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py @@ -44,8 +44,8 @@ def test_integration(self): allocated_storage=5, db_instance_class='db.t1.micro', engine='postgres', - master_username='bototestuser', - master_user_password='testtestt3st', + main_username='bototestuser', + main_user_password='testtestt3st', # Try to limit the impact & test options. multi_az=False, backup_retention_period=0 diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py index 490618e1..61685081 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py @@ -36,8 +36,8 @@ def setUp(self): self.api = RedshiftConnection() self.cluster_prefix = 'boto-redshift-cluster-%s' self.node_type = 'dw.hs1.xlarge' - self.master_username = 'mrtest' - self.master_password = 'P4ssword' + self.main_username = 'mrtest' + self.main_password = 'P4ssword' self.db_name = 'simon' # Redshift was taking ~20 minutes to bring clusters up in testing. self.wait_time = 60 * 20 @@ -50,7 +50,7 @@ def create_cluster(self): cluster_id = self.cluster_id() self.api.create_cluster( cluster_id, self.node_type, - self.master_username, self.master_password, + self.main_username, self.main_password, db_name=self.db_name, number_of_nodes=3 ) @@ -71,7 +71,7 @@ def test_create_delete_cluster(self): cluster_id = self.cluster_id() self.api.create_cluster( cluster_id, self.node_type, - self.master_username, self.master_password, + self.main_username, self.main_password, db_name=self.db_name, number_of_nodes=3 ) diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py index ca13d1c0..68637ca3 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py @@ -193,7 +193,7 @@ def default_body(self): 2014-01-24T02:19:46Z - Master instance group + Main instance group 1 0 MASTER @@ -253,7 +253,7 @@ def test_list_instance_groups(self): self.assertEqual(response.instancegroups[0].instancetype, "m1.large") self.assertEqual(response.instancegroups[0].market, "ON_DEMAND") self.assertEqual( - response.instancegroups[0].name, "Master instance group") + response.instancegroups[0].name, "Main instance group") self.assertEqual( response.instancegroups[0].requestedinstancecount, '1') self.assertEqual(response.instancegroups[0].runninginstancecount, '0') @@ -587,7 +587,7 @@ def default_body(self): false - ec2-184-0-0-1.us-west-1.compute.amazonaws.com + ec2-184-0-0-1.us-west-1.compute.amazonaws.com 10 my-service-role @@ -622,7 +622,7 @@ def test_describe_cluster(self): self.assertEqual(response.applications[0].name, 'hadoop') self.assertEqual(response.applications[0].version, '1.0.3') self.assertEqual( - response.masterpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') + response.mainpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') self.assertEqual(response.normalizedinstancehours, '10') self.assertEqual(response.servicerole, 'my-service-role') @@ -862,7 +862,7 @@ def default_body(self): us-west-1c - m1.large + m1.large my_key true @@ -879,7 +879,7 @@ def default_body(self): ON_DEMAND ig-aaaaaa MASTER - Master instance group + Main instance group 2014-01-24T01:21:21Z @@ -897,11 +897,11 @@ def default_body(self): Core instance group - m1.large - i-aaaaaa + m1.large + i-aaaaaa 1.0.3 12 - ec2-184-0-0-1.us-west-1.compute.amazonaws.com + ec2-184-0-0-1.us-west-1.compute.amazonaws.com 3 false @@ -930,15 +930,15 @@ def test_describe_jobflows_response(self): self.assertEqual(jf.name, 'test analytics') self.assertEqual(jf.jobflowid, 'j-aaaaaa') self.assertEqual(jf.ec2keyname, 'my_key') - self.assertEqual(jf.masterinstancetype, 'm1.large') + self.assertEqual(jf.maininstancetype, 'm1.large') self.assertEqual(jf.availabilityzone, 'us-west-1c') self.assertEqual(jf.keepjobflowalivewhennosteps, 'true') - self.assertEqual(jf.slaveinstancetype, 'm1.large') - self.assertEqual(jf.masterinstanceid, 'i-aaaaaa') + self.assertEqual(jf.subordinateinstancetype, 'm1.large') + self.assertEqual(jf.maininstanceid, 'i-aaaaaa') self.assertEqual(jf.hadoopversion, '1.0.3') self.assertEqual(jf.normalizedinstancehours, '12') self.assertEqual( - jf.masterpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') + jf.mainpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') self.assertEqual(jf.instancecount, '3') self.assertEqual(jf.terminationprotected, 'false') @@ -961,7 +961,7 @@ def test_describe_jobflows_response(self): self.assertEqual(ig.market, 'ON_DEMAND') self.assertEqual(ig.instancegroupid, 'ig-aaaaaa') self.assertEqual(ig.instancerole, 'MASTER') - self.assertEqual(ig.name, 'Master instance group') + self.assertEqual(ig.name, 'Main instance group') def test_describe_jobflows_no_args(self): self.set_http_response(200) @@ -1033,8 +1033,8 @@ def test_run_jobflow_service_role(self): 'Name': 'EmrCluster'}, ignore_params_values=['ActionOnFailure', 'Instances.InstanceCount', 'Instances.KeepJobFlowAliveWhenNoSteps', - 'Instances.MasterInstanceType', - 'Instances.SlaveInstanceType']) + 'Instances.MainInstanceType', + 'Instances.SubordinateInstanceType']) def test_run_jobflow_enable_debugging(self): self.region = 'ap-northeast-2' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py index dda6b928..656bde7d 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py @@ -85,8 +85,8 @@ us-east-1a - m1.small - m1.small + m1.small + m1.small myec2keyname 4 true @@ -281,8 +281,8 @@ j-3H3Q13JPFLU22 - m1.large - i-64c21609 + m1.large + i-64c21609 us-east-1b @@ -300,7 +300,7 @@ Job flow terminated MASTER ig-EVMHOZJ2SCO8 - master + main 2010-10-21T01:00:25Z @@ -315,13 +315,13 @@ Job flow terminated CORE ig-YZHDYVITVHKB - slave + subordinate 40 0.20 - m1.large - ec2-184-72-153-139.compute-1.amazonaws.com + m1.large + ec2-184-72-153-139.compute-1.amazonaws.com myubersecurekey 10 false @@ -361,8 +361,8 @@ def test_JobFlows_example(self): loguri='mybucket/subdir/', name='MyJobFlowName', availabilityzone='us-east-1a', - slaveinstancetype='m1.small', - masterinstancetype='m1.small', + subordinateinstancetype='m1.small', + maininstancetype='m1.small', ec2keyname='myec2keyname', keepjobflowalivewhennosteps='true') @@ -379,8 +379,8 @@ def test_JobFlows_completed(self): loguri='s3n://example.emrtest.scripts/jobflow_logs/', name='RealJobFlowName', availabilityzone='us-east-1b', - slaveinstancetype='m1.large', - masterinstancetype='m1.large', + subordinateinstancetype='m1.large', + maininstancetype='m1.large', ec2keyname='myubersecurekey', keepjobflowalivewhennosteps='false') self.assertEquals(6, len(jobflow.steps)) diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py index cc5c747b..eb8b0229 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py @@ -19,7 +19,7 @@ def test_bidprice_missing_spot(self): """ with self.assertRaisesRegexp(ValueError, 'bidprice must be specified'): InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master') + 'SPOT', 'main') def test_bidprice_missing_ondemand(self): """ @@ -27,14 +27,14 @@ def test_bidprice_missing_ondemand(self): ON_DEMAND. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'ON_DEMAND', 'master') + 'ON_DEMAND', 'main') def test_bidprice_Decimal(self): """ Test InstanceGroup init works with bidprice type = Decimal. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice=Decimal(1.10)) + 'SPOT', 'main', bidprice=Decimal(1.10)) self.assertEquals('1.10', instance_group.bidprice[:4]) def test_bidprice_float(self): @@ -42,7 +42,7 @@ def test_bidprice_float(self): Test InstanceGroup init works with bidprice type = float. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice=1.1) + 'SPOT', 'main', bidprice=1.1) self.assertEquals('1.1', instance_group.bidprice) def test_bidprice_string(self): @@ -50,7 +50,7 @@ def test_bidprice_string(self): Test InstanceGroup init works with bidprice type = string. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice='1.1') + 'SPOT', 'main', bidprice='1.1') self.assertEquals('1.1', instance_group.bidprice) if __name__ == "__main__": diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py index fbc65b09..8f4bc529 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py @@ -88,7 +88,7 @@ def default_body(self): 2012-10-03T22:01:51.047Z 200 db.m1.large - awsuser + awsuser @@ -150,7 +150,7 @@ def test_get_all_db_instances(self): db.endpoint, (u'mydbinstance2.c0hjqouvn9mf.us-west-2.rds.amazonaws.com', 3306)) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'awsuser') + self.assertEqual(db.main_username, 'awsuser') self.assertEqual(db.availability_zone, 'us-west-2b') self.assertEqual(db.backup_retention_period, 1) self.assertEqual(db.preferred_backup_window, '10:30-11:00') @@ -198,7 +198,7 @@ def default_body(self): mysql - **** + **** 0 false @@ -252,7 +252,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main @@ -267,7 +267,7 @@ def test_create_db_instance_param_group_name(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -283,8 +283,8 @@ def test_create_db_instance_param_group_name(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306 }, ignore_params_values=['Version']) @@ -293,10 +293,10 @@ def test_create_db_instance_param_group_name(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.pending_modified_values, - {'MasterUserPassword': '****'}) + {'MainUserPassword': '****'}) self.assertEqual(db.parameter_group.name, 'default.mysql5.1') @@ -312,7 +312,7 @@ def test_create_db_instance_param_group_instance(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group=param_group, db_subnet_group_name='dbSubnetgroup01') @@ -326,8 +326,8 @@ def test_create_db_instance_param_group_instance(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, }, ignore_params_values=['Version']) @@ -336,10 +336,10 @@ def test_create_db_instance_param_group_instance(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.pending_modified_values, - {'MasterUserPassword': '****'}) + {'MainUserPassword': '****'}) self.assertEqual(db.parameter_group.name, 'default.mysql5.1') self.assertEqual(db.parameter_group.description, None) @@ -383,7 +383,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main @@ -411,7 +411,7 @@ def test_restore_dbinstance_from_point_in_time(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.parameter_group.name, @@ -445,7 +445,7 @@ def test_create_db_instance_vpc_sg_str(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -460,8 +460,8 @@ def test_create_db_instance_vpc_sg_str(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, 'VpcSecurityGroupIds.member.1': 'sg-1', 'VpcSecurityGroupIds.member.2': 'sg-2' @@ -481,7 +481,7 @@ def test_create_db_instance_vpc_sg_obj(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -496,8 +496,8 @@ def test_create_db_instance_vpc_sg_obj(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, 'VpcSecurityGroupIds.member.1': 'sg-1', 'VpcSecurityGroupIds.member.2': 'sg-2' @@ -674,9 +674,9 @@ class TestRDSLogFileDownload(AWSMockServiceTestCase): 2014-01-27 09:35:15.44 spid74 I/O is frozen on database rdsadmin. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. -2014-01-27 09:35:15.44 spid73 I/O is frozen on database master. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. +2014-01-27 09:35:15.44 spid73 I/O is frozen on database main. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. -2014-01-27 09:35:25.57 spid73 I/O was resumed on database master. No user action is required. +2014-01-27 09:35:25.57 spid73 I/O was resumed on database main. No user action is required. 2014-01-27 09:35:25.57 spid74 I/O was resumed on database rdsadmin. No user action is required. diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py index c3c9d8a6..aded3ccd 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py @@ -27,7 +27,7 @@ def default_body(self): 5.1.50 mydbsnapshot manual - master + main myoptiongroupname 1000 100 @@ -47,7 +47,7 @@ def default_body(self): 5.1.49 mysnapshot1 manual - sa + sa myoptiongroupname 1000 @@ -64,7 +64,7 @@ def default_body(self): 5.1.47 rds:simcoprod01-2012-04-02-00-01 automated - master + main myoptiongroupname 1000 @@ -118,7 +118,7 @@ def default_body(self): 5.1.50 mydbsnapshot manual - master + main @@ -160,7 +160,7 @@ def default_body(self): 5.1.50 mycopieddbsnapshot manual - master + main @@ -202,7 +202,7 @@ def default_body(self): 5.1.47 mysnapshot2 manual - master + main @@ -257,7 +257,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py index 73d77248..accfa4d4 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py @@ -509,7 +509,7 @@ def default_body(self): 1800 - ns-1929.awsdns-93.net. hostmaster.awsdns.net. 1 10800 3600 604800 1800 + ns-1929.awsdns-93.net. hostmain.awsdns.net. 1 10800 3600 604800 1800 diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/crcmod/docs/source/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/crcmod/docs/source/conf.py index 87abe837..b8c0f1a7 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/crcmod/docs/source/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/crcmod/docs/source/conf.py @@ -36,8 +36,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'crcmod' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/fasteners/doc/source/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/fasteners/doc/source/conf.py index dd20a54c..29a68632 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/fasteners/doc/source/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/fasteners/doc/source/conf.py @@ -48,8 +48,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'Fasteners' @@ -229,7 +229,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'Fasteners.tex', u'Fasteners Documentation', + (main_doc, 'Fasteners.tex', u'Fasteners Documentation', u'Joshua Harlow', 'manual'), ] @@ -259,7 +259,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'fasteners', u'Fasteners Documentation', + (main_doc, 'fasteners', u'Fasteners Documentation', [author], 1) ] @@ -273,7 +273,7 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'Fasteners', u'Fasteners Documentation', + (main_doc, 'Fasteners', u'Fasteners Documentation', author, 'Fasteners', 'One line description of project.', 'Miscellaneous'), ] diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/funcsigs/docs/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/funcsigs/docs/conf.py index c6e4194c..3b1747c7 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/funcsigs/docs/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/funcsigs/docs/conf.py @@ -37,8 +37,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = 'funcsigs' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/mock/docs/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/mock/docs/conf.py index d32357da..b4173248 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/mock/docs/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/mock/docs/conf.py @@ -62,8 +62,8 @@ def __init__(self): # The suffix of source filenames. source_suffix = '.txt' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General substitutions. project = u'Mock' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/oauth2client/docs/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/oauth2client/docs/conf.py index 1b4663b2..5e8eb9ce 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/oauth2client/docs/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/oauth2client/docs/conf.py @@ -57,7 +57,7 @@ def __getattr__(cls, name): ] templates_path = ['_templates'] source_suffix = '.rst' -master_doc = 'index' +main_doc = 'index' # General information about the project. project = u'oauth2client' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/pyasn1/docs/source/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/pyasn1/docs/source/conf.py index 1e91e209..d05038fa 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/pyasn1/docs/source/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/pyasn1/docs/source/conf.py @@ -42,8 +42,8 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'contents' +# The main toctree document. +main_doc = 'contents' # General information about the project. project = u'ASN.1 types and codecs' @@ -242,7 +242,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'PyASN1.tex', u'PyASN1 Documentation', + (main_doc, 'PyASN1.tex', u'PyASN1 Documentation', u'Ilya Etingof \\textless{}etingof@gmail.com\\textgreater{}', 'manual'), ] @@ -272,7 +272,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'pyasn1', u'PyASN1 Documentation', + (main_doc, 'pyasn1', u'PyASN1 Documentation', [author], 1) ] @@ -286,7 +286,7 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'PyASN1', u'PyASN1 Documentation', + (main_doc, 'PyASN1', u'PyASN1 Documentation', author, 'PyASN1', 'One line description of project.', 'Miscellaneous'), ] diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/rsa/doc/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/rsa/doc/conf.py index 95317b21..06219794 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/rsa/doc/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/rsa/doc/conf.py @@ -41,8 +41,8 @@ # The encoding of source files. source_encoding = 'utf-8' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'Python-RSA' diff --git a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/six/documentation/conf.py b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/six/documentation/conf.py index 0215bdd4..a7cd039e 100644 --- a/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/six/documentation/conf.py +++ b/google-cloud-sdk/.install/.backup/platform/gsutil/third_party/six/documentation/conf.py @@ -28,8 +28,8 @@ # The encoding of source files. #source_encoding = "utf-8-sig" -# The master toctree document. -master_doc = "index" +# The main toctree document. +main_doc = "index" # General information about the project. project = u"six" diff --git a/google-cloud-sdk/data/cli/gcloud_completions.py b/google-cloud-sdk/data/cli/gcloud_completions.py index aa4dba31..b0097543 100644 --- a/google-cloud-sdk/data/cli/gcloud_completions.py +++ b/google-cloud-sdk/data/cli/gcloud_completions.py @@ -4991,7 +4991,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--enable-stackdriver-kubernetes": "bool", @@ -5004,8 +5004,8 @@ "--local-ssd-volumes": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", - "--master-ipv4-cidr": "value", + "--main-authorized-networks": "value", + "--main-ipv4-cidr": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -5097,13 +5097,13 @@ "--enable-autoscaling": "bool", "--enable-basic-auth": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--generate-password": "bool", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-accelerator": "value", "--max-cpu": "value", "--max-memory": "value", @@ -5134,7 +5134,7 @@ "--cluster-version": "value", "--concurrent-node-count": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -10010,18 +10010,18 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-ca-certificate-path": "value", - "--master-dump-file-path": "value", - "--master-instance-name": "value", - "--master-password": "value", - "--master-username": "value", + "--main-ca-certificate-path": "value", + "--main-dump-file-path": "value", + "--main-instance-name": "value", + "--main-password": "value", + "--main-username": "value", "--memory": "value", "--network": "value", "--pricing-plan": [ "PACKAGE", "PER_USE" ], - "--prompt-for-master-password": "bool", + "--prompt-for-main-password": "bool", "--region": "value", "--replica-type": [ "FAILOVER", @@ -16311,7 +16311,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--enable-stackdriver-kubernetes": "bool", @@ -16322,8 +16322,8 @@ "--local-ssd-count": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", - "--master-ipv4-cidr": "value", + "--main-authorized-networks": "value", + "--main-ipv4-cidr": "value", "--max-nodes": "value", "--max-nodes-per-pool": "value", "--min-cpu-platform": "value", @@ -16408,13 +16408,13 @@ "--enable-autoscaling": "bool", "--enable-basic-auth": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--enable-pod-security-policy": "bool", "--generate-password": "bool", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-nodes": "value", "--min-nodes": "value", "--monitoring-service": "value", @@ -16438,7 +16438,7 @@ "--async": "bool", "--cluster-version": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -16775,18 +16775,18 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", "--num-workers": "value", @@ -17340,18 +17340,18 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-accelerator": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", - "--master-min-cpu-platform": "value", + "--main-accelerator": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", + "--main-min-cpu-platform": "value", "--max-age": "value", "--max-idle": "value", "--metadata": "value", "--network": "value", "--no-address": "bool", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", "--num-workers": "value", @@ -21561,17 +21561,17 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-ca-certificate-path": "value", - "--master-dump-file-path": "value", - "--master-instance-name": "value", - "--master-password": "value", - "--master-username": "value", + "--main-ca-certificate-path": "value", + "--main-dump-file-path": "value", + "--main-instance-name": "value", + "--main-password": "value", + "--main-username": "value", "--memory": "value", "--pricing-plan": [ "PACKAGE", "PER_USE" ], - "--prompt-for-master-password": "bool", + "--prompt-for-main-password": "bool", "--region": "value", "--replica-type": [ "FAILOVER", @@ -25570,7 +25570,7 @@ "--enable-ip-alias": "bool", "--enable-kubernetes-alpha": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--image-type": "value", "--issue-client-certificate": "bool", @@ -25578,7 +25578,7 @@ "--local-ssd-count": "value", "--machine-type": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-nodes": "value", "--max-nodes-per-pool": "value", "--min-cpu-platform": "value", @@ -25655,12 +25655,12 @@ "--enable-autoscaling": "bool", "--enable-basic-auth": "bool", "--enable-legacy-authorization": "bool", - "--enable-master-authorized-networks": "bool", + "--enable-main-authorized-networks": "bool", "--enable-network-policy": "bool", "--generate-password": "bool", "--logging-service": "value", "--maintenance-window": "value", - "--master-authorized-networks": "value", + "--main-authorized-networks": "value", "--max-nodes": "value", "--min-nodes": "value", "--monitoring-service": "value", @@ -25684,7 +25684,7 @@ "--async": "bool", "--cluster-version": "value", "--image-type": "value", - "--master": "bool", + "--main": "bool", "--node-pool": "value", "--region": "value", "--zone": "value" @@ -25948,13 +25948,13 @@ "--initialization-action-timeout": "value", "--initialization-actions": "value", "--labels": "value", - "--master-boot-disk-size": "value", - "--master-boot-disk-type": "value", - "--master-machine-type": "value", + "--main-boot-disk-size": "value", + "--main-boot-disk-type": "value", + "--main-machine-type": "value", "--metadata": "value", "--network": "value", - "--num-master-local-ssds": "value", - "--num-masters": "value", + "--num-main-local-ssds": "value", + "--num-mains": "value", "--num-preemptible-workers": "value", "--num-worker-local-ssds": "value", "--num-workers": "value", @@ -29429,7 +29429,7 @@ "WED" ], "--maintenance-window-hour": "value", - "--master-instance-name": "value", + "--main-instance-name": "value", "--memory": "value", "--pricing-plan": [ "PACKAGE", diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py index 14f6bb94..34a164ad 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/app/ext_runtimes/loader.py @@ -62,7 +62,7 @@ class InvalidRepositoryError(exceptions.Error): """Attempted to fetch or clone from a repository missing something basic. This gets raised if we try to fetch or clone from a repo that is either - missing a HEAD or missing both a "latest" tag and a master branch. + missing a HEAD or missing both a "latest" tag and a main branch. """ @@ -147,7 +147,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): Returns: (str, dulwich.objects.Commit) The tag that was actually pulled (we try to - get "latest" but fall back to "master") and the commit object + get "latest" but fall back to "main") and the commit object associated with it. Raises: @@ -164,7 +164,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): # Try to get the "latest" tag (latest released version) revision = None tag = None - for tag in (b'refs/tags/latest', b'refs/heads/master'): + for tag in (b'refs/tags/latest', b'refs/heads/main'): try: log.debug('looking up ref %s', tag) revision = local_repo[tag] @@ -173,7 +173,7 @@ def _PullTags(local_repo, client_wrapper, target_dir): log.warning('Unable to checkout branch %s', tag) else: - raise AssertionError('No "refs/heads/master" tag found in repository.') + raise AssertionError('No "refs/heads/main" tag found in repository.') return tag, revision @@ -258,7 +258,7 @@ def InstallRuntimeDef(url, target_dir): directory. At this time, the runtime definition url must be the URL of a git repository and we identify the tree to checkout based on 1) the presence of a "latest" tag ("refs/tags/latest") 2) if there is no "latest" tag, the - head of the "master" branch ("refs/heads/master"). + head of the "main" branch ("refs/heads/main"). Args: url: (str) A URL identifying a git repository. The HTTP, TCP and local diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py index 82448e08..0b6f58d5 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/api_adapter.py @@ -50,8 +50,8 @@ """ MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG = """\ -Cannot use --master-authorized-networks \ -if --enable-master-authorized-networks is not \ +Cannot use --main-authorized-networks \ +if --enable-main-authorized-networks is not \ specified.""" NO_AUTOPROVISIONING_MSG = """\ @@ -329,8 +329,8 @@ def __init__(self, enable_autorepair=None, enable_autoupgrade=None, service_account=None, - enable_master_authorized_networks=None, - master_authorized_networks=None, + enable_main_authorized_networks=None, + main_authorized_networks=None, enable_legacy_authorization=None, labels=None, disk_type=None, @@ -348,7 +348,7 @@ def __init__(self, enable_pod_security_policy=None, allow_route_overlap=None, private_cluster=None, - master_ipv4_cidr=None, + main_ipv4_cidr=None, tpu_ipv4_cidr=None, enable_tpu=None, default_max_pods_per_node=None, @@ -392,8 +392,8 @@ def __init__(self, self.enable_autorepair = enable_autorepair self.enable_autoupgrade = enable_autoupgrade self.service_account = service_account - self.enable_master_authorized_networks = enable_master_authorized_networks - self.master_authorized_networks = master_authorized_networks + self.enable_main_authorized_networks = enable_main_authorized_networks + self.main_authorized_networks = main_authorized_networks self.enable_legacy_authorization = enable_legacy_authorization self.enable_network_policy = enable_network_policy self.labels = labels @@ -411,7 +411,7 @@ def __init__(self, self.enable_pod_security_policy = enable_pod_security_policy self.allow_route_overlap = allow_route_overlap self.private_cluster = private_cluster - self.master_ipv4_cidr = master_ipv4_cidr + self.main_ipv4_cidr = main_ipv4_cidr self.tpu_ipv4_cidr = tpu_ipv4_cidr self.enable_tpu = enable_tpu self.issue_client_certificate = issue_client_certificate @@ -424,7 +424,7 @@ class UpdateClusterOptions(object): def __init__(self, version=None, - update_master=None, + update_main=None, update_nodes=None, node_pool=None, monitoring_service=None, @@ -436,14 +436,14 @@ def __init__(self, image=None, image_project=None, locations=None, - enable_master_authorized_networks=None, - master_authorized_networks=None, + enable_main_authorized_networks=None, + main_authorized_networks=None, enable_autoprovisioning=None, enable_pod_security_policy=None, enable_binauthz=None, concurrent_node_count=None): self.version = version - self.update_master = bool(update_master) + self.update_main = bool(update_main) self.update_nodes = bool(update_nodes) self.node_pool = node_pool self.monitoring_service = monitoring_service @@ -455,16 +455,16 @@ def __init__(self, self.image = image self.image_project = image_project self.locations = locations - self.enable_master_authorized_networks = enable_master_authorized_networks - self.master_authorized_networks = master_authorized_networks + self.enable_main_authorized_networks = enable_main_authorized_networks + self.main_authorized_networks = main_authorized_networks self.enable_autoprovisioning = enable_autoprovisioning self.enable_pod_security_policy = enable_pod_security_policy self.enable_binauthz = enable_binauthz self.concurrent_node_count = concurrent_node_count -class SetMasterAuthOptions(object): - """Options to pass to SetMasterAuth.""" +class SetMainAuthOptions(object): + """Options to pass to SetMainAuth.""" SET_PASSWORD = 'SetPassword' GENERATE_PASSWORD = 'GeneratePassword' @@ -830,7 +830,7 @@ def CreateClusterCommon(self, cluster_ref, options): cluster = self.messages.Cluster( name=cluster_ref.clusterId, nodePools=pools, - masterAuth=self.messages.MasterAuth(username=options.user, + mainAuth=self.messages.MainAuth(username=options.user, password=options.password)) if options.additional_zones: cluster.locations = sorted([cluster_ref.zone] + options.additional_zones) @@ -856,17 +856,17 @@ def CreateClusterCommon(self, cluster_ref, options): disable_network_policy=( NETWORK_POLICY not in options.addons)) cluster.addonsConfig = addons - if options.enable_master_authorized_networks: - authorized_networks = self.messages.MasterAuthorizedNetworksConfig( - enabled=options.enable_master_authorized_networks) - if options.master_authorized_networks: - for network in options.master_authorized_networks: + if options.enable_main_authorized_networks: + authorized_networks = self.messages.MainAuthorizedNetworksConfig( + enabled=options.enable_main_authorized_networks) + if options.main_authorized_networks: + for network in options.main_authorized_networks: authorized_networks.cidrBlocks.append(self.messages.CidrBlock( cidrBlock=network)) - cluster.masterAuthorizedNetworksConfig = authorized_networks - elif options.master_authorized_networks: - # Raise error if use --master-authorized-networks without - # --enable-master-authorized-networks. + cluster.mainAuthorizedNetworksConfig = authorized_networks + elif options.main_authorized_networks: + # Raise error if use --main-authorized-networks without + # --enable-main-authorized-networks. raise util.Error(MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG) if options.enable_kubernetes_alpha: @@ -912,7 +912,7 @@ def CreateClusterCommon(self, cluster_ref, options): enabled=options.enable_pod_security_policy) if options.issue_client_certificate is not None: - cluster.masterAuth.clientCertificateConfig = ( + cluster.mainAuth.clientCertificateConfig = ( self.messages.ClientCertificateConfig( issueClientCertificate=options.issue_client_certificate)) @@ -987,7 +987,7 @@ def ParseAllowRouteOverlapOptions(self, options, cluster): def ParsePrivateClusterOptions(self, options, cluster): """Parses the options for Private Clusters.""" if options.private_cluster: - cluster.masterIpv4CidrBlock = options.master_ipv4_cidr + cluster.mainIpv4CidrBlock = options.main_ipv4_cidr cluster.privateCluster = options.private_cluster return cluster @@ -1030,9 +1030,9 @@ def UpdateClusterCommon(self, options): desiredImageType=options.image_type, desiredImage=options.image, desiredImageProject=options.image_project) - elif options.update_master: + elif options.update_main: update = self.messages.ClusterUpdate( - desiredMasterVersion=options.version) + desiredMainVersion=options.version) elif options.monitoring_service: update = self.messages.ClusterUpdate( desiredMonitoringService=options.monitoring_service) @@ -1055,16 +1055,16 @@ def UpdateClusterCommon(self, options): desiredNodePoolAutoscaling=autoscaling) elif options.locations: update = self.messages.ClusterUpdate(desiredLocations=options.locations) - elif options.enable_master_authorized_networks is not None: + elif options.enable_main_authorized_networks is not None: # For update, we can either enable or disable. - authorized_networks = self.messages.MasterAuthorizedNetworksConfig( - enabled=options.enable_master_authorized_networks) - if options.master_authorized_networks: - for network in options.master_authorized_networks: + authorized_networks = self.messages.MainAuthorizedNetworksConfig( + enabled=options.enable_main_authorized_networks) + if options.main_authorized_networks: + for network in options.main_authorized_networks: authorized_networks.cidrBlocks.append(self.messages.CidrBlock( cidrBlock=network)) update = self.messages.ClusterUpdate( - desiredMasterAuthorizedNetworksConfig=authorized_networks) + desiredMainAuthorizedNetworksConfig=authorized_networks) elif options.enable_autoprovisioning is not None: autoscaling = self.CreateClusterAutoscalingCommon(options) update = self.messages.ClusterUpdate( @@ -1080,10 +1080,10 @@ def UpdateClusterCommon(self, options): update = self.messages.ClusterUpdate( desiredBinaryAuthorization=binary_authorization) - if (options.master_authorized_networks - and not options.enable_master_authorized_networks): - # Raise error if use --master-authorized-networks without - # --enable-master-authorized-networks. + if (options.main_authorized_networks + and not options.enable_main_authorized_networks): + # Raise error if use --main-authorized-networks without + # --enable-main-authorized-networks. raise util.Error(MISMATCH_AUTHORIZED_NETWORKS_ERROR_MSG) return update @@ -1214,29 +1214,29 @@ def SetNetworkPolicy(self, cluster_ref, options): self.client.projects_locations_clusters.SetNetworkPolicy(req).name, cluster_ref.zone) - def SetMasterAuthCommon(self, options): - """Returns a SetMasterAuth action.""" - update = self.messages.MasterAuth( + def SetMainAuthCommon(self, options): + """Returns a SetMainAuth action.""" + update = self.messages.MainAuth( username=options.username, password=options.password) - if options.action == SetMasterAuthOptions.SET_PASSWORD: - action = (self.messages.SetMasterAuthRequest. + if options.action == SetMainAuthOptions.SET_PASSWORD: + action = (self.messages.SetMainAuthRequest. ActionValueValuesEnum.SET_PASSWORD) - elif options.action == SetMasterAuthOptions.GENERATE_PASSWORD: - action = (self.messages.SetMasterAuthRequest. + elif options.action == SetMainAuthOptions.GENERATE_PASSWORD: + action = (self.messages.SetMainAuthRequest. ActionValueValuesEnum.GENERATE_PASSWORD) - else: # options.action == SetMasterAuthOptions.SET_USERNAME + else: # options.action == SetMainAuthOptions.SET_USERNAME action = ( - self.messages.SetMasterAuthRequest.ActionValueValuesEnum.SET_USERNAME) + self.messages.SetMainAuthRequest.ActionValueValuesEnum.SET_USERNAME) return update, action - def SetMasterAuth(self, cluster_ref, options): - update, action = self.SetMasterAuthCommon(options) - req = self.messages.SetMasterAuthRequest( + def SetMainAuth(self, cluster_ref, options): + update, action = self.SetMainAuthCommon(options) + req = self.messages.SetMainAuthRequest( name=ProjectLocationCluster(cluster_ref.projectId, cluster_ref.zone, cluster_ref.clusterId), action=action, update=update) - op = self.client.projects_locations_clusters.SetMasterAuth(req) + op = self.client.projects_locations_clusters.SetMainAuth(req) return self.ParseOperation(op.name, cluster_ref.zone) def StartIpRotation(self, cluster_ref, rotate_credentials): diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py index 01249faf..861a166b 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/kubeconfig.py @@ -224,7 +224,7 @@ def _AuthProvider(name='gcp'): Constructs an auth provider config entry readable by kubectl. This tells kubectl to call out to a specific gcloud command and parse the output to - retrieve access tokens to authenticate to the kubernetes master. + retrieve access tokens to authenticate to the kubernetes main. Kubernetes gcp auth provider plugin at https://github.com/kubernetes/kubernetes/tree/master/staging/src/k8s.io/client-go/plugin/pkg/client/auth/gcp diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py index 488efda3..4b1e78c5 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/transforms.py @@ -66,16 +66,16 @@ def ParseExpireTime(s): return expire_dt - times.Now(expire_dt.tzinfo) -def TransformMasterVersion(r, undefined=''): - """Returns the formatted master version. +def TransformMainVersion(r, undefined=''): + """Returns the formatted main version. Args: r: JSON-serializable object. undefined: Returns this value if the resource cannot be formatted. Returns: - The formatted master version. + The formatted main version. """ - version = r.get('currentMasterVersion', None) + version = r.get('currentMainVersion', None) if version is None: return undefined if r.get('enableKubernetesAlpha', False): @@ -94,7 +94,7 @@ def TransformMasterVersion(r, undefined=''): _TRANSFORMS = { - 'master_version': TransformMasterVersion, + 'main_version': TransformMainVersion, } diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py index d6605f01..6a40a92d 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/container/util.py @@ -34,7 +34,7 @@ table( name, zone:label=LOCATION, - master_version():label=MASTER_VERSION, + main_version():label=MASTER_VERSION, endpoint:label=MASTER_IP, nodePools[0].config.machineType, currentNodeVersion:label=NODE_VERSION, @@ -243,7 +243,7 @@ def Persist(cls, cluster, project_id): 'project_id': project_id, 'server': 'https://' + cluster.endpoint, } - auth = cluster.masterAuth + auth = cluster.mainAuth if auth and auth.clusterCaCertificate: kwargs['ca_data'] = auth.clusterCaCertificate else: diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py index bcb98e47..609b85d5 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/dns/import_util.py @@ -77,7 +77,7 @@ def _SOATranslation(rdata, origin): Returns: str, The translation of the given SOA rdata which includes all the required - SOA fields. Note that the master NS name is left in a substitutable form + SOA fields. Note that the main NS name is left in a substitutable form because it is always provided by Cloud DNS. """ return ' '.join( @@ -272,7 +272,7 @@ def RecordSetsFromZoneFile(zone_file, domain, api_version='v1'): A (name, type) keyed dict of ResourceRecordSets that were obtained from the zone file. Note that only A, AAAA, CNAME, MX, PTR, SOA, SPF, SRV, and TXT record-sets are retrieved. Other record-set types are not supported by Cloud - DNS. Also, the master NS field for SOA records is discarded since that is + DNS. Also, the main NS field for SOA records is discarded since that is provided by Cloud DNS. """ zone_contents = zone.from_file(zone_file, domain, check_origin=False) @@ -296,7 +296,7 @@ def RecordSetsFromYamlFile(yaml_file, api_version='v1'): A (name, type) keyed dict of ResourceRecordSets that were obtained from the yaml file. Note that only A, AAAA, CNAME, MX, PTR, SOA, SPF, SRV, and TXT record-sets are retrieved. Other record-set types are not supported by Cloud - DNS. Also, the master NS field for SOA records is discarded since that is + DNS. Also, the main NS field for SOA records is discarded since that is provided by Cloud DNS. """ record_sets = {} @@ -317,7 +317,7 @@ def RecordSetsFromYamlFile(yaml_file, api_version='v1'): record_set.rrdatas = yaml_record_set['rrdatas'] if rdata_type is rdatatype.SOA: - # Make master NS name substitutable. + # Make main NS name substitutable. record_set.rrdatas[0] = re.sub(r'\S+', '{0}', record_set.rrdatas[0], count=1) @@ -347,7 +347,7 @@ def _RecordSetCopy(record_set, api_version='v1'): def _SOAReplacement(current_record, record_to_be_imported, api_version='v1'): - """Returns the replacement SOA record with restored master NS name. + """Returns the replacement SOA record with restored main NS name. Args: current_record: ResourceRecordSet, Current record-set. @@ -355,7 +355,7 @@ def _SOAReplacement(current_record, record_to_be_imported, api_version='v1'): api_version: [str], the api version to use for creating the records. Returns: - ResourceRecordSet, the replacement SOA record with restored master NS name. + ResourceRecordSet, the replacement SOA record with restored main NS name. """ replacement = _RecordSetCopy(record_to_be_imported, api_version=api_version) replacement.rrdatas[0] = replacement.rrdatas[0].format( diff --git a/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py b/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py index 97a4e839..3ed8ced3 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py +++ b/google-cloud-sdk/lib/googlecloudsdk/api_lib/sql/instance_prop_reducers.py @@ -234,7 +234,7 @@ def MachineType(instance=None, tier=None, memory=None, cpu=None): def OnPremisesConfiguration(sql_messages, source_ip_address, source_port): - """Generates the external master configuration for the instance. + """Generates the external main configuration for the instance. Args: sql_messages: module, The messages module that should be used. @@ -268,21 +268,21 @@ def PrivateNetworkUrl(network): def ReplicaConfiguration(sql_messages, - master_username, - master_password, - master_dump_file_path, - master_ca_certificate_path=None, + main_username, + main_password, + main_dump_file_path, + main_ca_certificate_path=None, client_certificate_path=None, client_key_path=None): - """Generates the config for an external master replica. + """Generates the config for an external main replica. Args: sql_messages: module, The messages module that should be used. - master_username: The username for connecting to the external instance. - master_password: The password for connecting to the external instance. - master_dump_file_path: ObjectReference, a wrapper for the URI of the Cloud + main_username: The username for connecting to the external instance. + main_password: The password for connecting to the external instance. + main_dump_file_path: ObjectReference, a wrapper for the URI of the Cloud Storage path containing the dumpfile to seed the replica with. - master_ca_certificate_path: The path to the CA certificate PEM file. + main_ca_certificate_path: The path to the CA certificate PEM file. client_certificate_path: The path to the client certificate PEM file. client_key_path: The path to the client private key PEM file. @@ -290,12 +290,12 @@ def ReplicaConfiguration(sql_messages, sql_messages.MySqlReplicaConfiguration object. """ mysql_replica_configuration = sql_messages.MySqlReplicaConfiguration( - username=master_username, - password=master_password, - dumpFilePath=master_dump_file_path.ToUrl()) - if master_ca_certificate_path: + username=main_username, + password=main_password, + dumpFilePath=main_dump_file_path.ToUrl()) + if main_ca_certificate_path: mysql_replica_configuration.caCertificate = files.ReadFileContents( - master_ca_certificate_path) + main_ca_certificate_path) if client_certificate_path: mysql_replica_configuration.clientCertificate = files.ReadFileContents( client_certificate_path) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py index 1281e970..480abb47 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/composer/util.py @@ -162,7 +162,7 @@ def TemporaryKubeconfig(location_id, cluster_id): gke_api = gke_api_adapter.NewAPIAdapter(GKE_API_VERSION) cluster_ref = gke_api.ParseCluster(cluster_id, location_id) cluster = gke_api.GetCluster(cluster_ref) - auth = cluster.masterAuth + auth = cluster.mainAuth missing_creds = not (auth and auth.clientCertificate and auth.clientKey) if missing_creds and not gke_util.ClusterConfig.UseGCPAuthProvider(): raise Error('Unable to get cluster credentials. User must have edit ' diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py index 399f5f66..a95dd6f7 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/constants.py @@ -32,7 +32,7 @@ "This will create a cluster with all Kubernetes Alpha features enabled.\n" "- This cluster will not be covered by the Kubernetes Engine SLA and should" " not be used for production workloads.\n" - "- You will not be able to upgrade the master or nodes.\n" + "- You will not be able to upgrade the main or nodes.\n" "- The cluster will be deleted after 30 days.\n" ) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py index 66989d87..13b5098e 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/container_command_util.py @@ -41,14 +41,14 @@ def _NodePoolFromCluster(cluster, node_pool_name): node_pool_name)) -def ClusterUpgradeMessage(name, cluster=None, master=False, node_pool_name=None, +def ClusterUpgradeMessage(name, cluster=None, main=False, node_pool_name=None, new_version=None, concurrent_node_count=None): """Get a message to print during gcloud container clusters upgrade. Args: name: str, the name of the cluster being upgraded. cluster: the cluster object. - master: bool, if the upgrade applies to the master version. + main: bool, if the upgrade applies to the main version. node_pool_name: str, the name of the node pool if the upgrade is for a specific node pool. new_version: str, the name of the new version, if given. @@ -65,11 +65,11 @@ def ClusterUpgradeMessage(name, cluster=None, master=False, node_pool_name=None, if new_version: new_version_message = 'version [{}]'.format(new_version) else: - new_version_message = 'master version' - if master: - node_message = 'Master' + new_version_message = 'main version' + if main: + node_message = 'Main' if cluster: - current_version = cluster.currentMasterVersion + current_version = cluster.currentMainVersion elif node_pool_name: node_message = 'All nodes in node pool [{}]'.format(node_pool_name) if cluster: @@ -83,7 +83,7 @@ def ClusterUpgradeMessage(name, cluster=None, master=False, node_pool_name=None, else: node_message = 'All nodes' concurrent_message = '' - if not master and concurrent_node_count: + if not main and concurrent_node_count: concurrent_message = '{} {} will be upgraded at a time. '.format( concurrent_node_count, text.Pluralize(concurrent_node_count, 'node')) @@ -183,5 +183,5 @@ def ParseUpdateOptionsBase(args, locations): max_nodes=args.max_nodes, node_pool=args.node_pool, locations=locations, - enable_master_authorized_networks=args.enable_master_authorized_networks, - master_authorized_networks=args.master_authorized_networks) + enable_main_authorized_networks=args.enable_main_authorized_networks, + main_authorized_networks=args.main_authorized_networks) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py index 4b68de9f..473f5764 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/container/flags.py @@ -175,7 +175,7 @@ def AddClusterVersionFlag(parser, suppressed=False, help=None): # pylint: disab """Adds a --cluster-version flag to the given parser.""" if help is None: help = """\ -The Kubernetes version to use for the master and nodes. Defaults to +The Kubernetes version to use for the main and nodes. Defaults to server-specified. The default Kubernetes version is available using the following command. @@ -677,56 +677,56 @@ def AddTagsFlag(parser, help_text): help=help_text) -def AddMasterAuthorizedNetworksFlags(parser, enable_group_for_update=None): - """Adds Master Authorized Networks related flags to parser. +def AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=None): + """Adds Main Authorized Networks related flags to parser. - Master Authorized Networks related flags are: - --enable-master-authorized-networks --master-authorized-networks. + Main Authorized Networks related flags are: + --enable-main-authorized-networks --main-authorized-networks. Args: parser: A given parser. enable_group_for_update: An optional group of mutually exclusive flag - options to which an --enable-master-authorized-networks flag is added + options to which an --enable-main-authorized-networks flag is added in an update command. If given, the flag will default to None instead of False. """ if enable_group_for_update is None: # Flags are being added to the same group. - master_flag_group = parser.add_argument_group('Master Authorized Networks') - enable_flag_group = master_flag_group + main_flag_group = parser.add_argument_group('Main Authorized Networks') + enable_flag_group = main_flag_group enable_default = False else: # Flags are being added to different groups, so the new one should have no # help text (has only one arg). - master_flag_group = parser.add_argument_group('') + main_flag_group = parser.add_argument_group('') enable_flag_group = enable_group_for_update enable_default = None enable_flag_group.add_argument( - '--enable-master-authorized-networks', + '--enable-main-authorized-networks', default=enable_default, help="""\ Allow only specified set of CIDR blocks (specified by the -`--master-authorized-networks` flag) to connect to Kubernetes master through +`--main-authorized-networks` flag) to connect to Kubernetes main through HTTPS. Besides these blocks, the following have access as well:\n 1) The private network the cluster connects to if `--private-cluster` is specified. 2) Google Compute Engine Public IPs if `--private-cluster` is not specified.\n When disabled, public internet (0.0.0.0/0) is allowed to connect to Kubernetes -master through HTTPS. +main through HTTPS. """, action='store_true') - master_flag_group.add_argument( - '--master-authorized-networks', + main_flag_group.add_argument( + '--main-authorized-networks', type=arg_parsers.ArgList( min_length=1, max_length=api_adapter.MAX_AUTHORIZED_NETWORKS_CIDRS), metavar='NETWORK', help='The list of CIDR blocks (up to {max}) that are allowed to connect ' - 'to Kubernetes master through HTTPS. Specified in CIDR notation (e.g. ' + 'to Kubernetes main through HTTPS. Specified in CIDR notation (e.g. ' '1.2.3.4/30). Can not be specified unless ' - '`--enable-master-authorized-networks` is also specified.'.format( + '`--enable-main-authorized-networks` is also specified.'.format( max=api_adapter.MAX_AUTHORIZED_NETWORKS_CIDRS)) @@ -739,12 +739,12 @@ def AddNetworkPolicyFlags(parser, hidden=False): hidden=hidden, help='Enable network policy enforcement for this cluster. If you are ' 'enabling network policy on an existing cluster the network policy ' - 'addon must first be enabled on the master by using ' + 'addon must first be enabled on the main by using ' '--update-addons=NetworkPolicy=ENABLED flag.') def AddPrivateClusterFlags(parser, hidden=False): - """Adds --private-cluster flag to parser and --master-ipv4-cidr to parser.""" + """Adds --private-cluster flag to parser and --main-ipv4-cidr to parser.""" group = parser.add_argument_group('Private Clusters') group.add_argument( '--private-cluster', @@ -755,8 +755,8 @@ def AddPrivateClusterFlags(parser, hidden=False): required=True, hidden=hidden) group.add_argument( - '--master-ipv4-cidr', - help=('IPv4 CIDR range to use for the master network. This should be a ' + '--main-ipv4-cidr', + help=('IPv4 CIDR range to use for the main network. This should be a ' '/28 and should be used in conjunction with the --private-cluster ' 'flag.'), default=None, @@ -1206,7 +1206,7 @@ def AddNodeLocationsFlag(parser): metavar='ZONE', help="""\ The set of zones in which the specified node footprint should be replicated. -All zones must be in the same region as the cluster's master(s), specified by +All zones must be in the same region as the cluster's main(s), specified by the `--zone` or `--region` flag. Additionally, for zonal clusters, `--node-locations` must contain the cluster's primary zone. If not specified, all nodes will be in the cluster's primary zone (for zonal clusters) or spread @@ -1492,7 +1492,7 @@ def AddIssueClientCertificateFlag(parser): Issue a TLS client certificate with admin permissions. When enabled, the certificate and private key pair will be present in -MasterAuth field of the Cluster object. +MainAuth field of the Cluster object. """ parser.add_argument( '--issue-client-certificate', diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py index 44b2af9b..3b47a95b 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/clusters.py @@ -67,7 +67,7 @@ def ArgsForClusterRef(parser, beta=False): help="""\ Create a single node cluster. - A single node cluster has all master and worker components. + A single node cluster has all main and worker components. It cannot have any separate worker nodes. If this flag is not specified, a cluster with separate workers is created. """) @@ -84,8 +84,8 @@ def ArgsForClusterRef(parser, beta=False): help='The number of preemptible worker nodes in the cluster.') parser.add_argument( - '--master-machine-type', - help='The type of machine to use for the master. Defaults to ' + '--main-machine-type', + help='The type of machine to use for the main. Defaults to ' 'server-specified.') parser.add_argument( '--worker-machine-type', @@ -128,9 +128,9 @@ def ArgsForClusterRef(parser, beta=False): type=int, help='The number of local SSDs to attach to each worker in a cluster.') parser.add_argument( - '--num-master-local-ssds', + '--num-main-local-ssds', type=int, - help='The number of local SSDs to attach to the master in a cluster.') + help='The number of local SSDs to attach to the main in a cluster.') parser.add_argument( '--initialization-actions', type=arg_parsers.ArgList(min_length=1), @@ -145,17 +145,17 @@ def ArgsForClusterRef(parser, beta=False): help=('The maximum duration of each initialization action. See ' '$ gcloud topic datetimes for information on duration formats.')) parser.add_argument( - '--num-masters', + '--num-mains', type=arg_parsers.CustomFunctionValidator( lambda n: int(n) in [1, 3], - 'Number of masters must be 1 (Standard) or 3 (High Availability)', + 'Number of mains must be 1 (Standard) or 3 (High Availability)', parser=arg_parsers.BoundedInt(1, 3)), help="""\ - The number of master nodes in the cluster. + The number of main nodes in the cluster. [format="csv",options="header"] |======== - Number of Masters,Cluster Mode + Number of Mains,Cluster Mode 1,Standard 3,High Availability |======== @@ -245,19 +245,19 @@ def ArgsForClusterRef(parser, beta=False): aliases=compute_helpers.SCOPE_ALIASES_FOR_HELP, scope_deprecation_msg=compute_constants.DEPRECATED_SCOPES_MESSAGES)) - master_boot_disk_size = parser.add_mutually_exclusive_group() + main_boot_disk_size = parser.add_mutually_exclusive_group() worker_boot_disk_size = parser.add_mutually_exclusive_group() # Deprecated, to be removed at a future date. - master_boot_disk_size.add_argument( - '--master-boot-disk-size-gb', + main_boot_disk_size.add_argument( + '--main-boot-disk-size-gb', action=actions.DeprecationAction( - '--master-boot-disk-size-gb', - warn=('The `--master-boot-disk-size-gb` flag is deprecated. ' - 'Use `--master-boot-disk-size` flag with "GB" after value.')), + '--main-boot-disk-size-gb', + warn=('The `--main-boot-disk-size-gb` flag is deprecated. ' + 'Use `--main-boot-disk-size` flag with "GB" after value.')), type=int, hidden=True, - help='Use `--master-boot-disk-size` flag with "GB" after value.') + help='Use `--main-boot-disk-size` flag with "GB" after value.') worker_boot_disk_size.add_argument( '--worker-boot-disk-size-gb', action=actions.DeprecationAction( @@ -275,8 +275,8 @@ def ArgsForClusterRef(parser, beta=False): ``10GB'' will produce a 10 gigabyte disk. The minimum size a boot disk can have is 10 GB. Disk size must be a multiple of 1 GB. """ - master_boot_disk_size.add_argument( - '--master-boot-disk-size', + main_boot_disk_size.add_argument( + '--main-boot-disk-size', type=arg_parsers.BinarySize(lower_bound='10GB'), help=boot_disk_size_detailed_help) worker_boot_disk_size.add_argument( @@ -307,7 +307,7 @@ def ArgsForClusterRef(parser, beta=False): ``pd-ssd''. """ parser.add_argument( - '--master-boot-disk-type', help=boot_disk_type_detailed_help) + '--main-boot-disk-type', help=boot_disk_type_detailed_help) parser.add_argument( '--worker-boot-disk-type', help=boot_disk_type_detailed_help) parser.add_argument( @@ -328,14 +328,14 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): Returns: cluster_config: Dataproc cluster configuration """ - master_accelerator_type = None + main_accelerator_type = None worker_accelerator_type = None - master_accelerator_count = None + main_accelerator_count = None worker_accelerator_count = None if beta: - if args.master_accelerator: - master_accelerator_type = args.master_accelerator['type'] - master_accelerator_count = args.master_accelerator.get('count', 1) + if args.main_accelerator: + main_accelerator_type = args.main_accelerator['type'] + main_accelerator_count = args.main_accelerator.get('count', 1) if args.worker_accelerator: worker_accelerator_type = args.worker_accelerator['type'] worker_accelerator_count = args.worker_accelerator.get('count', 1) @@ -371,9 +371,9 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): software_config = dataproc.messages.SoftwareConfig( imageVersion=args.image_version) - master_boot_disk_size_gb = args.master_boot_disk_size_gb - if args.master_boot_disk_size: - master_boot_disk_size_gb = (api_utils.BytesToGb(args.master_boot_disk_size)) + main_boot_disk_size_gb = args.main_boot_disk_size_gb + if args.main_boot_disk_size: + main_boot_disk_size_gb = (api_utils.BytesToGb(args.main_boot_disk_size)) worker_boot_disk_size_gb = args.worker_boot_disk_size_gb if args.worker_boot_disk_size: @@ -408,12 +408,12 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): gce_cluster_config.metadata = encoding.DictToMessage( flat_metadata, dataproc.messages.GceClusterConfig.MetadataValue) - master_accelerators = [] - if master_accelerator_type: - master_accelerators.append( + main_accelerators = [] + if main_accelerator_type: + main_accelerators.append( dataproc.messages.AcceleratorConfig( - acceleratorTypeUri=master_accelerator_type, - acceleratorCount=master_accelerator_count)) + acceleratorTypeUri=main_accelerator_type, + acceleratorCount=main_accelerator_count)) worker_accelerators = [] if worker_accelerator_type: worker_accelerators.append( @@ -424,16 +424,16 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): cluster_config = dataproc.messages.ClusterConfig( configBucket=args.bucket, gceClusterConfig=gce_cluster_config, - masterConfig=dataproc.messages.InstanceGroupConfig( - numInstances=args.num_masters, + mainConfig=dataproc.messages.InstanceGroupConfig( + numInstances=args.num_mains, imageUri=image_ref and image_ref.SelfLink(), - machineTypeUri=args.master_machine_type, - accelerators=master_accelerators, + machineTypeUri=args.main_machine_type, + accelerators=main_accelerators, diskConfig=GetDiskConfig( dataproc, - args.master_boot_disk_type if beta else None, - master_boot_disk_size_gb, - args.num_master_local_ssds + args.main_boot_disk_type if beta else None, + main_boot_disk_size_gb, + args.num_main_local_ssds )), workerConfig=dataproc.messages.InstanceGroupConfig( numInstances=args.num_workers, @@ -451,7 +451,7 @@ def GetClusterConfig(args, dataproc, project_id, compute_resources, beta=False): ) if beta: - cluster_config.masterConfig.minCpuPlatform = args.master_min_cpu_platform + cluster_config.mainConfig.minCpuPlatform = args.main_min_cpu_platform cluster_config.workerConfig.minCpuPlatform = args.worker_min_cpu_platform if beta: diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py index 36322596..0de80ce3 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/dataproc/flags.py @@ -117,7 +117,7 @@ def AddParametersFlag(parser): def AddMinCpuPlatformArgs(parser, track): - """Add mininum CPU platform flags for both master and worker instances.""" + """Add mininum CPU platform flags for both main and worker instances.""" help_text = """\ When specified, the VM will be scheduled on host with specified CPU architecture or a newer one. To list available CPU platforms in given @@ -133,7 +133,7 @@ def AddMinCpuPlatformArgs(parser, track): https://cloud.google.com/compute/docs/instances/specify-min-cpu-platform """.format(track.prefix + ' ' if track.prefix else '') parser.add_argument( - '--master-min-cpu-platform', + '--main-min-cpu-platform', metavar='PLATFORM', required=False, help=help_text) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py index 7400f20b..82639cc4 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/deploy/source_util.py @@ -119,7 +119,7 @@ def _AddDefaultBranch(source_archive_url): r'/projects/[^/]+' r'/repos/[^/]+$') if re.match(cloud_repo_pattern, source_archive_url): - return source_archive_url + '/moveable-aliases/master' + return source_archive_url + '/moveable-aliases/main' return source_archive_url diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py index ff82f96b..c8f33a39 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/functions/flags.py @@ -124,9 +124,9 @@ def AddSourceFlag(parser): `https://source.developers.google.com/projects/${PROJECT}/repos/${REPO}` By using the URL above, sources from the root directory of the repository - on the revision tagged `master` will be used. + on the revision tagged `main` will be used. - If you want to deploy from a revision different from `master`, append one + If you want to deploy from a revision different from `main`, append one of the following three sources to the URL: 1. `/revisions/${REVISION}`, diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py index e51d2bd0..3d176a85 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/flags.py @@ -55,7 +55,7 @@ pythonModule, parameterServerType:optional, parameterServerCount:optional, - masterType:optional, + mainType:optional, workerType:optional, workerCount:optional, jobDir:optional diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py index d3b00783..892ad503 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/jobs_util.py @@ -86,8 +86,8 @@ cluster specification. When you use this tier, set values to configure your processing cluster according to these guidelines (using the --config flag): -* You _must_ set `TrainingInput.masterType` to specify the type of machine to - use for your master node. This is the only required setting. +* You _must_ set `TrainingInput.mainType` to specify the type of machine to + use for your main node. This is the only required setting. * You _may_ set `TrainingInput.workerCount` to specify the number of workers to use. If you specify one or more workers, you _must_ also set `TrainingInput.workerType` to specify the type of machine to use for your @@ -97,8 +97,8 @@ _must_ also set `TrainingInput.parameterServerType` to specify the type of machine to use for your parameter servers. Note that all of your workers must use the same machine type, which can be different from your parameter server - type and master type. Your parameter servers must likewise use the same - machine type, which can be different from your worker type and master type.\ + type and main type. Your parameter servers must likewise use the same + machine type, which can be different from your worker type and main type.\ """) } diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py index 5bd244fd..ec964367 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/ml_engine/local_train.py @@ -37,7 +37,7 @@ def MakeProcess(module_name, **extra_popen_args): """Make a Popen object that runs the module, with the correct env. - If task_type is 'master' instead replaces the current process with the + If task_type is 'main' instead replaces the current process with the subprocess via execution_utils.Exec Args: module_name: str. Name of the module to run, e.g. trainer.task @@ -53,7 +53,7 @@ def MakeProcess(module_name, Returns: a subprocess.Popen object corresponding to the subprocesses or an int corresponding to the return value of the subprocess - (if task_type is 'master') + (if task_type is 'main') Raises: RuntimeError: if there is no python executable on the user system """ @@ -80,7 +80,7 @@ def MakeProcess(module_name, # configuration options to the training module. the module specific # arguments are passed as command line arguments. env['TF_CONFIG'] = json.dumps(config) - if task_type == 'master': + if task_type == 'main': return execution_utils.Exec( cmd, env=env, no_exit=True, cwd=package_root, **extra_popen_args) else: @@ -113,18 +113,18 @@ def RunDistributed(module_name, user_args: [str]. Additional user args for the task. Any relative paths will not work. Returns: - int. the retval of 'master' subprocess + int. the retval of 'main' subprocess """ ports = list(range(start_port, start_port + num_ps + num_workers + 1)) cluster = { - 'master': ['localhost:{port}'.format(port=ports[0])], + 'main': ['localhost:{port}'.format(port=ports[0])], 'ps': ['localhost:{port}'.format(port=p) for p in ports[1:num_ps + 1]], 'worker': ['localhost:{port}'.format(port=p) for p in ports[num_ps + 1:]] } for task_type, addresses in cluster.items(): - if task_type != 'master': + if task_type != 'main': for i in range(len(addresses)): MakeProcess(module_name, package_root, @@ -135,6 +135,6 @@ def RunDistributed(module_name, return MakeProcess(module_name, package_root, args=user_args, - task_type='master', + task_type='main', index=0, cluster=cluster) diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py index 7d88b295..82aeb0d7 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/flags.py @@ -289,20 +289,20 @@ def AddEnableBinLog(parser, show_negated_in_help=False): **kwargs) -def AddExternalMasterGroup(parser): - """Add flags to the parser for creating an external master and replica.""" +def AddExternalMainGroup(parser): + """Add flags to the parser for creating an external main and replica.""" # Group for creating external primary instances. - external_master_group = parser.add_group( + external_main_group = parser.add_group( required=False, help='Options for creating a wrapper for an external data source.') - external_master_group.add_argument( + external_main_group.add_argument( '--source-ip-address', required=True, type=compute_utils.IPV4Argument, help=('Public IP address used to connect to and replicate from ' 'the external data source.')) - external_master_group.add_argument( + external_main_group.add_argument( '--source-port', type=arg_parsers.BoundedInt(lower_bound=1, upper_bound=65535), # Default MySQL port number. @@ -316,25 +316,25 @@ def AddExternalMasterGroup(parser): help=('Options for creating an internal replica of an external data ' 'source.')) internal_replica_group.add_argument( - '--master-username', + '--main-username', required=True, help='Name of the replication user on the external data source.') # TODO(b/78648703): Make group required when mutex required status is fixed. # For entering the password of the replication user of an external primary. - master_password_group = internal_replica_group.add_group( + main_password_group = internal_replica_group.add_group( 'Password group.', mutex=True) - master_password_group.add_argument( - '--master-password', + main_password_group.add_argument( + '--main-password', help='Password of the replication user on the external data source.') - master_password_group.add_argument( - '--prompt-for-master-password', + main_password_group.add_argument( + '--prompt-for-main-password', action='store_true', help=('Prompt for the password of the replication user on the ' 'external data source. The password is all typed characters up ' 'to but not including the RETURN or ENTER key.')) internal_replica_group.add_argument( - '--master-dump-file-path', + '--main-dump-file-path', required=True, type=storage_util.ObjectReference.FromArgument, help=('Path to the MySQL dump file in Google Cloud Storage from ' @@ -346,7 +346,7 @@ def AddExternalMasterGroup(parser): credential_group = internal_replica_group.add_group( 'Client and server credentials.', required=False) credential_group.add_argument( - '--master-ca-certificate-path', + '--main-ca-certificate-path', required=True, help=('Path to a file containing the X.509v3 (RFC5280) PEM encoded ' 'certificate of the CA that signed the external data source\'s ' diff --git a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py index ea1cb186..95e4f382 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py +++ b/google-cloud-sdk/lib/googlecloudsdk/command_lib/sql/instances.py @@ -312,9 +312,9 @@ def ConstructCreateInstanceFromArgs(cls, instance_resource.region = reducers.Region(args.region, args.gce_zone) instance_resource.databaseVersion = args.database_version - instance_resource.masterInstanceName = args.master_instance_name + instance_resource.mainInstanceName = args.main_instance_name - # BETA: Set the host port and return early if external master instance. + # BETA: Set the host port and return early if external main instance. if _IsBetaOrNewer(release_track) and args.IsSpecified('source_ip_address'): on_premises_configuration = reducers.OnPremisesConfiguration( sql_messages, args.source_ip_address, args.source_port) @@ -324,7 +324,7 @@ def ConstructCreateInstanceFromArgs(cls, instance_resource.settings = cls._ConstructCreateSettingsFromArgs( sql_messages, args, original, release_track) - if args.master_instance_name: + if args.main_instance_name: replication = 'ASYNCHRONOUS' if args.replica_type == 'FAILOVER': instance_resource.replicaConfiguration = ( @@ -339,30 +339,30 @@ def ConstructCreateInstanceFromArgs(cls, sql_messages.DatabaseInstance.FailoverReplicaValue( name=args.failover_replica_name)) - # BETA: Config for creating a replica of an external master instance. - if _IsBetaOrNewer(release_track) and args.IsSpecified('master_username'): - # Ensure that the master instance name is specified. - if not args.IsSpecified('master_instance_name'): + # BETA: Config for creating a replica of an external main instance. + if _IsBetaOrNewer(release_track) and args.IsSpecified('main_username'): + # Ensure that the main instance name is specified. + if not args.IsSpecified('main_instance_name'): raise exceptions.RequiredArgumentException( - '--master-instance-name', 'To create a read replica of an external ' - 'master instance, [--master-instance-name] must be specified') + '--main-instance-name', 'To create a read replica of an external ' + 'main instance, [--main-instance-name] must be specified') # TODO(b/78648703): Remove when mutex required status is fixed. - # Ensure that the master replication user password is specified. - if not (args.IsSpecified('master_password') or - args.IsSpecified('prompt_for_master_password')): + # Ensure that the main replication user password is specified. + if not (args.IsSpecified('main_password') or + args.IsSpecified('prompt_for_main_password')): raise exceptions.RequiredArgumentException( - '--master-password', 'To create a read replica of an external ' - 'master instance, [--master-password] or ' - '[--prompt-for-master-password] must be specified') + '--main-password', 'To create a read replica of an external ' + 'main instance, [--main-password] or ' + '[--prompt-for-main-password] must be specified') # Get password if not specified on command line. - if args.prompt_for_master_password: - args.master_password = getpass.getpass('Master Instance Password: ') + if args.prompt_for_main_password: + args.main_password = getpass.getpass('Main Instance Password: ') instance_resource.replicaConfiguration = reducers.ReplicaConfiguration( - sql_messages, args.master_username, args.master_password, - args.master_dump_file_path, args.master_ca_certificate_path, + sql_messages, args.main_username, args.main_password, + args.main_dump_file_path, args.main_ca_certificate_path, args.client_certificate_path, args.client_key_path) return instance_resource diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py index 8c92ab0c..06b4ab66 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1/appengine_v1_messages.py @@ -819,7 +819,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py index 55e95c61..00e0ca6b 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1alpha/appengine_v1alpha_messages.py @@ -330,7 +330,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py index a4ca3dfe..27e2fe2b 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/appengine/v1beta/appengine_v1beta_messages.py @@ -819,7 +819,7 @@ class AuthorizedCertificate(_messages.Message): class AuthorizedDomain(_messages.Message): r"""A domain that a user has been authorized to administer. To authorize use - of a domain, verify ownership via Webmaster Central + of a domain, verify ownership via Webmain Central (https://www.google.com/webmasters/verification/home). Fields: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py index 7f84b02a..5728321f 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_client.py @@ -97,10 +97,10 @@ def Create(self, request, global_params=None): [billing subaccounts](https://cloud.google.com/billing/docs/concepts) by GCP resellers. When creating a subaccount, the current authenticated user must have the -`billing.accounts.update` IAM permission on the master account, which is +`billing.accounts.update` IAM permission on the main account, which is typically given to billing account [administrators](https://cloud.google.com/billing/docs/how-to/billing-access). -This method will return an error if the master account has not been +This method will return an error if the main account has not been provisioned as a reseller account. Args: diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py index aa82cc21..a7c02eac 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudbilling/v1/cloudbilling_v1_messages.py @@ -132,9 +132,9 @@ class BillingAccount(_messages.Message): Fields: displayName: The display name given to the billing account, such as `My Billing Account`. This name is displayed in the GCP Console. - masterBillingAccount: If this account is a + mainBillingAccount: If this account is a [subaccount](https://cloud.google.com/billing/docs/concepts), then this - will be the resource name of the master billing account that it is being + will be the resource name of the main billing account that it is being resold through. Otherwise this will be empty. name: The resource name of the billing account. The resource name has the form `billingAccounts/{billing_account_id}`. For example, @@ -147,7 +147,7 @@ class BillingAccount(_messages.Message): """ displayName = _messages.StringField(1) - masterBillingAccount = _messages.StringField(2) + mainBillingAccount = _messages.StringField(2) name = _messages.StringField(3) open = _messages.BooleanField(4) @@ -227,7 +227,7 @@ class CloudbillingBillingAccountsListRequest(_messages.Message): this only supports filtering for [subaccounts](https://cloud.google.com/billing/docs/concepts) under a single provided reseller billing account. (e.g. - "master_billing_account=billingAccounts/012345-678901-ABCDEF"). Boolean + "main_billing_account=billingAccounts/012345-678901-ABCDEF"). Boolean algebra and other fields are not currently supported. pageSize: Requested page size. The maximum page size is 100; this is also the default. diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py index e86a8b6a..2fb498e3 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/cloudfunctions/v1/cloudfunctions_v1_messages.py @@ -825,7 +825,7 @@ class SourceRepository(_messages.Message): opers.google.com/projects/*/repos/*/revisions/*/paths/*` To refer to a moveable alias (branch): `https://source.developers.google.com/projects/*/repos/*/moveable- - aliases/*/paths/*` In particular, to refer to HEAD use `master` moveable + aliases/*/paths/*` In particular, to refer to HEAD use `main` moveable alias. To refer to a specific fixed alias (tag): `https://source.developers.google.com/projects/*/repos/*/fixed- aliases/*/paths/*` You may omit `paths/*` if you want to use the main diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py index 2361fa6e..2978276a 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_client.py @@ -35,17 +35,17 @@ def __init__(self, url='', credentials=None, default_global_params=default_global_params, additional_http_headers=additional_http_headers, response_encoding=response_encoding) - self.masterProjects_locations_projects_clusters_master = self.MasterProjectsLocationsProjectsClustersMasterService(self) - self.masterProjects_locations_projects_clusters_namespaces = self.MasterProjectsLocationsProjectsClustersNamespacesService(self) - self.masterProjects_locations_projects_clusters = self.MasterProjectsLocationsProjectsClustersService(self) - self.masterProjects_locations_projects = self.MasterProjectsLocationsProjectsService(self) - self.masterProjects_locations_signedUrls = self.MasterProjectsLocationsSignedUrlsService(self) - self.masterProjects_locations_tokens = self.MasterProjectsLocationsTokensService(self) - self.masterProjects_locations = self.MasterProjectsLocationsService(self) - self.masterProjects_zones_signedUrls = self.MasterProjectsZonesSignedUrlsService(self) - self.masterProjects_zones_tokens = self.MasterProjectsZonesTokensService(self) - self.masterProjects_zones = self.MasterProjectsZonesService(self) - self.masterProjects = self.MasterProjectsService(self) + self.mainProjects_locations_projects_clusters_main = self.MainProjectsLocationsProjectsClustersMainService(self) + self.mainProjects_locations_projects_clusters_namespaces = self.MainProjectsLocationsProjectsClustersNamespacesService(self) + self.mainProjects_locations_projects_clusters = self.MainProjectsLocationsProjectsClustersService(self) + self.mainProjects_locations_projects = self.MainProjectsLocationsProjectsService(self) + self.mainProjects_locations_signedUrls = self.MainProjectsLocationsSignedUrlsService(self) + self.mainProjects_locations_tokens = self.MainProjectsLocationsTokensService(self) + self.mainProjects_locations = self.MainProjectsLocationsService(self) + self.mainProjects_zones_signedUrls = self.MainProjectsZonesSignedUrlsService(self) + self.mainProjects_zones_tokens = self.MainProjectsZonesTokensService(self) + self.mainProjects_zones = self.MainProjectsZonesService(self) + self.mainProjects = self.MainProjectsService(self) self.projects_locations_clusters_nodePools = self.ProjectsLocationsClustersNodePoolsService(self) self.projects_locations_clusters = self.ProjectsLocationsClustersService(self) self.projects_locations_operations = self.ProjectsLocationsOperationsService(self) @@ -56,22 +56,22 @@ def __init__(self, url='', credentials=None, self.projects_zones = self.ProjectsZonesService(self) self.projects = self.ProjectsService(self) - class MasterProjectsLocationsProjectsClustersMasterService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects_clusters_master resource.""" + class MainProjectsLocationsProjectsClustersMainService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects_clusters_main resource.""" - _NAME = u'masterProjects_locations_projects_clusters_master' + _NAME = u'mainProjects_locations_projects_clusters_main' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsClustersMasterService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsClustersMainService, self).__init__(client) self._upload_configs = { } def AckRepairwork(self, request, global_params=None): r"""AcknowledgeRepairWork accepts acknowledgements of repair work from the. -Hosted Master. +Hosted Main. Args: - request: (ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest) input message + request: (ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AckRepairWorkResponse) The response message. @@ -82,23 +82,23 @@ def AckRepairwork(self, request, global_params=None): AckRepairwork.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.projects.clusters.master.ackRepairwork', - ordered_params=[u'masterProjectName', u'location', u'projectNumber', u'clusterId', u'masterId'], - path_params=[u'clusterId', u'location', u'masterId', u'masterProjectName', u'projectNumber'], + method_id=u'container.mainProjects.locations.projects.clusters.main.ackRepairwork', + ordered_params=[u'mainProjectName', u'location', u'projectNumber', u'clusterId', u'mainId'], + path_params=[u'clusterId', u'location', u'mainId', u'mainProjectName', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/master/{masterId}/ackRepairwork', + relative_path=u'v1/mainProjects/{mainProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/main/{mainId}/ackRepairwork', request_field=u'ackRepairWorkRequest', - request_type_name=u'ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest', + request_type_name=u'ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest', response_type_name=u'AckRepairWorkResponse', supports_download=False, ) def GetRepairwork(self, request, global_params=None): r"""This method requests work from the API server to see if there are. -any repairs to be done on the Hosted Master. +any repairs to be done on the Hosted Main. Args: - request: (ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest) input message + request: (ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (GetRepairWorkResponse) The response message. @@ -109,24 +109,24 @@ def GetRepairwork(self, request, global_params=None): GetRepairwork.method_config = lambda: base_api.ApiMethodInfo( http_method=u'GET', - method_id=u'container.masterProjects.locations.projects.clusters.master.getRepairwork', - ordered_params=[u'masterProjectName', u'location', u'projectNumber', u'clusterId', u'masterId'], - path_params=[u'clusterId', u'location', u'masterId', u'masterProjectName', u'projectNumber'], + method_id=u'container.mainProjects.locations.projects.clusters.main.getRepairwork', + ordered_params=[u'mainProjectName', u'location', u'projectNumber', u'clusterId', u'mainId'], + path_params=[u'clusterId', u'location', u'mainId', u'mainProjectName', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/master/{masterId}/repairwork', + relative_path=u'v1/mainProjects/{mainProjectName}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/main/{mainId}/repairwork', request_field='', - request_type_name=u'ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest', + request_type_name=u'ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest', response_type_name=u'GetRepairWorkResponse', supports_download=False, ) - class MasterProjectsLocationsProjectsClustersNamespacesService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects_clusters_namespaces resource.""" + class MainProjectsLocationsProjectsClustersNamespacesService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects_clusters_namespaces resource.""" - _NAME = u'masterProjects_locations_projects_clusters_namespaces' + _NAME = u'mainProjects_locations_projects_clusters_namespaces' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsClustersNamespacesService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsClustersNamespacesService, self).__init__(client) self._upload_configs = { } @@ -135,7 +135,7 @@ def Finalize(self, request, global_params=None): now, this involved purging IAM policies. Args: - request: (ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest) input message + request: (ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Empty) The response message. @@ -146,54 +146,54 @@ def Finalize(self, request, global_params=None): Finalize.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.projects.clusters.namespaces.finalize', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId', u'namespaceId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'namespaceId', u'projectNumber'], + method_id=u'container.mainProjects.locations.projects.clusters.namespaces.finalize', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId', u'namespaceId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'namespaceId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/namespaces/{namespaceId}/finalize', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/projects/{projectNumber}/clusters/{clusterId}/namespaces/{namespaceId}/finalize', request_field='', - request_type_name=u'ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest', + request_type_name=u'ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest', response_type_name=u'Empty', supports_download=False, ) - class MasterProjectsLocationsProjectsClustersService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects_clusters resource.""" + class MainProjectsLocationsProjectsClustersService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects_clusters resource.""" - _NAME = u'masterProjects_locations_projects_clusters' + _NAME = u'mainProjects_locations_projects_clusters' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsClustersService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsClustersService, self).__init__(client) self._upload_configs = { } - class MasterProjectsLocationsProjectsService(base_api.BaseApiService): - """Service class for the masterProjects_locations_projects resource.""" + class MainProjectsLocationsProjectsService(base_api.BaseApiService): + """Service class for the mainProjects_locations_projects resource.""" - _NAME = u'masterProjects_locations_projects' + _NAME = u'mainProjects_locations_projects' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsProjectsService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsProjectsService, self).__init__(client) self._upload_configs = { } - class MasterProjectsLocationsSignedUrlsService(base_api.BaseApiService): - """Service class for the masterProjects_locations_signedUrls resource.""" + class MainProjectsLocationsSignedUrlsService(base_api.BaseApiService): + """Service class for the mainProjects_locations_signedUrls resource.""" - _NAME = u'masterProjects_locations_signedUrls' + _NAME = u'mainProjects_locations_signedUrls' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsSignedUrlsService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsSignedUrlsService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates signed URLs that allow for writing a file to a private GCS bucket. -for storing backups of hosted master data. Signed URLs are explained here: +for storing backups of hosted main data. Signed URLs are explained here: https://cloud.google.com/storage/docs/access-control#Signed-URLs Args: - request: (ContainerMasterProjectsLocationsSignedUrlsCreateRequest) input message + request: (ContainerMainProjectsLocationsSignedUrlsCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (SignedUrls) The response message. @@ -204,34 +204,34 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.signedUrls.create', - ordered_params=[u'masterProjectId', u'location'], - path_params=[u'location', u'masterProjectId'], + method_id=u'container.mainProjects.locations.signedUrls.create', + ordered_params=[u'mainProjectId', u'location'], + path_params=[u'location', u'mainProjectId'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/signedUrls', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/signedUrls', request_field=u'createSignedUrlsRequest', - request_type_name=u'ContainerMasterProjectsLocationsSignedUrlsCreateRequest', + request_type_name=u'ContainerMainProjectsLocationsSignedUrlsCreateRequest', response_type_name=u'SignedUrls', supports_download=False, ) - class MasterProjectsLocationsTokensService(base_api.BaseApiService): - """Service class for the masterProjects_locations_tokens resource.""" + class MainProjectsLocationsTokensService(base_api.BaseApiService): + """Service class for the mainProjects_locations_tokens resource.""" - _NAME = u'masterProjects_locations_tokens' + _NAME = u'mainProjects_locations_tokens' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsTokensService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsTokensService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates a compute-read-write (https://www.googleapis.com/auth/compute). -scoped OAuth2 access token for , to allow a hosted master +scoped OAuth2 access token for , to allow a hosted main to make modifications to its user's project. Args: - request: (ContainerMasterProjectsLocationsTokensCreateRequest) input message + request: (ContainerMainProjectsLocationsTokensCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Token) The response message. @@ -242,24 +242,24 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.tokens.create', - ordered_params=[u'masterProjectId', u'location'], - path_params=[u'location', u'masterProjectId'], + method_id=u'container.mainProjects.locations.tokens.create', + ordered_params=[u'mainProjectId', u'location'], + path_params=[u'location', u'mainProjectId'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/tokens', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/tokens', request_field=u'createTokenRequest', - request_type_name=u'ContainerMasterProjectsLocationsTokensCreateRequest', + request_type_name=u'ContainerMainProjectsLocationsTokensCreateRequest', response_type_name=u'Token', supports_download=False, ) - class MasterProjectsLocationsService(base_api.BaseApiService): - """Service class for the masterProjects_locations resource.""" + class MainProjectsLocationsService(base_api.BaseApiService): + """Service class for the mainProjects_locations resource.""" - _NAME = u'masterProjects_locations' + _NAME = u'mainProjects_locations' def __init__(self, client): - super(ContainerV1.MasterProjectsLocationsService, self).__init__(client) + super(ContainerV1.MainProjectsLocationsService, self).__init__(client) self._upload_configs = { } @@ -268,7 +268,7 @@ def Audit(self, request, global_params=None): policies defined by GKE. Args: - request: (ContainerMasterProjectsLocationsAuditRequest) input message + request: (ContainerMainProjectsLocationsAuditRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuditResponse) The response message. @@ -279,13 +279,13 @@ def Audit(self, request, global_params=None): Audit.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.audit', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.audit', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/audit', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/audit', request_field=u'auditEventList', - request_type_name=u'ContainerMasterProjectsLocationsAuditRequest', + request_type_name=u'ContainerMainProjectsLocationsAuditRequest', response_type_name=u'AuditResponse', supports_download=False, ) @@ -300,7 +300,7 @@ def Authenticate(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authentication.k8s.io/v1beta1/types.go. Args: - request: (ContainerMasterProjectsLocationsAuthenticateRequest) input message + request: (ContainerMainProjectsLocationsAuthenticateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthenticateResponse) The response message. @@ -311,13 +311,13 @@ def Authenticate(self, request, global_params=None): Authenticate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.authenticate', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.authenticate', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/authenticate', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/authenticate', request_field=u'authenticateRequest', - request_type_name=u'ContainerMasterProjectsLocationsAuthenticateRequest', + request_type_name=u'ContainerMainProjectsLocationsAuthenticateRequest', response_type_name=u'AuthenticateResponse', supports_download=False, ) @@ -332,7 +332,7 @@ def Authorize(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authorization/v1beta1/types.go. Args: - request: (ContainerMasterProjectsLocationsAuthorizeRequest) input message + request: (ContainerMainProjectsLocationsAuthorizeRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthorizeResponse) The response message. @@ -343,13 +343,13 @@ def Authorize(self, request, global_params=None): Authorize.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.authorize', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.authorize', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/authorize', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/authorize', request_field=u'authorizeRequest', - request_type_name=u'ContainerMasterProjectsLocationsAuthorizeRequest', + request_type_name=u'ContainerMainProjectsLocationsAuthorizeRequest', response_type_name=u'AuthorizeResponse', supports_download=False, ) @@ -363,7 +363,7 @@ def Imagereview(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/imagepolicy/v1beta1/types.go. Args: - request: (ContainerMasterProjectsLocationsImagereviewRequest) input message + request: (ContainerMainProjectsLocationsImagereviewRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (ImageReviewResponse) The response message. @@ -374,13 +374,13 @@ def Imagereview(self, request, global_params=None): Imagereview.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.imagereview', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.imagereview', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/imagereview', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/imagereview', request_field=u'imageReviewRequest', - request_type_name=u'ContainerMasterProjectsLocationsImagereviewRequest', + request_type_name=u'ContainerMainProjectsLocationsImagereviewRequest', response_type_name=u'ImageReviewResponse', supports_download=False, ) @@ -401,34 +401,34 @@ def Signcertificate(self, request, global_params=None): Signcertificate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.locations.signcertificate', - ordered_params=[u'masterProjectId', u'location', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'location', u'masterProjectId', u'projectNumber'], + method_id=u'container.mainProjects.locations.signcertificate', + ordered_params=[u'mainProjectId', u'location', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'location', u'mainProjectId', u'projectNumber'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/locations/{location}/{projectNumber}/{clusterId}/signcertificate', + relative_path=u'v1/mainProjects/{mainProjectId}/locations/{location}/{projectNumber}/{clusterId}/signcertificate', request_field='', request_type_name=u'CertificateSigningRequest', response_type_name=u'CertificateSigningRequest', supports_download=False, ) - class MasterProjectsZonesSignedUrlsService(base_api.BaseApiService): - """Service class for the masterProjects_zones_signedUrls resource.""" + class MainProjectsZonesSignedUrlsService(base_api.BaseApiService): + """Service class for the mainProjects_zones_signedUrls resource.""" - _NAME = u'masterProjects_zones_signedUrls' + _NAME = u'mainProjects_zones_signedUrls' def __init__(self, client): - super(ContainerV1.MasterProjectsZonesSignedUrlsService, self).__init__(client) + super(ContainerV1.MainProjectsZonesSignedUrlsService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates signed URLs that allow for writing a file to a private GCS bucket. -for storing backups of hosted master data. Signed URLs are explained here: +for storing backups of hosted main data. Signed URLs are explained here: https://cloud.google.com/storage/docs/access-control#Signed-URLs Args: - request: (ContainerMasterProjectsZonesSignedUrlsCreateRequest) input message + request: (ContainerMainProjectsZonesSignedUrlsCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (SignedUrls) The response message. @@ -439,34 +439,34 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.signedUrls.create', - ordered_params=[u'masterProjectId', u'zone'], - path_params=[u'masterProjectId', u'zone'], + method_id=u'container.mainProjects.zones.signedUrls.create', + ordered_params=[u'mainProjectId', u'zone'], + path_params=[u'mainProjectId', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/signedUrls', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/signedUrls', request_field=u'createSignedUrlsRequest', - request_type_name=u'ContainerMasterProjectsZonesSignedUrlsCreateRequest', + request_type_name=u'ContainerMainProjectsZonesSignedUrlsCreateRequest', response_type_name=u'SignedUrls', supports_download=False, ) - class MasterProjectsZonesTokensService(base_api.BaseApiService): - """Service class for the masterProjects_zones_tokens resource.""" + class MainProjectsZonesTokensService(base_api.BaseApiService): + """Service class for the mainProjects_zones_tokens resource.""" - _NAME = u'masterProjects_zones_tokens' + _NAME = u'mainProjects_zones_tokens' def __init__(self, client): - super(ContainerV1.MasterProjectsZonesTokensService, self).__init__(client) + super(ContainerV1.MainProjectsZonesTokensService, self).__init__(client) self._upload_configs = { } def Create(self, request, global_params=None): r"""Creates a compute-read-write (https://www.googleapis.com/auth/compute). -scoped OAuth2 access token for , to allow a hosted master +scoped OAuth2 access token for , to allow a hosted main to make modifications to its user's project. Args: - request: (ContainerMasterProjectsZonesTokensCreateRequest) input message + request: (ContainerMainProjectsZonesTokensCreateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Token) The response message. @@ -477,24 +477,24 @@ def Create(self, request, global_params=None): Create.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.tokens.create', - ordered_params=[u'masterProjectId', u'zone'], - path_params=[u'masterProjectId', u'zone'], + method_id=u'container.mainProjects.zones.tokens.create', + ordered_params=[u'mainProjectId', u'zone'], + path_params=[u'mainProjectId', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/tokens', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/tokens', request_field=u'createTokenRequest', - request_type_name=u'ContainerMasterProjectsZonesTokensCreateRequest', + request_type_name=u'ContainerMainProjectsZonesTokensCreateRequest', response_type_name=u'Token', supports_download=False, ) - class MasterProjectsZonesService(base_api.BaseApiService): - """Service class for the masterProjects_zones resource.""" + class MainProjectsZonesService(base_api.BaseApiService): + """Service class for the mainProjects_zones resource.""" - _NAME = u'masterProjects_zones' + _NAME = u'mainProjects_zones' def __init__(self, client): - super(ContainerV1.MasterProjectsZonesService, self).__init__(client) + super(ContainerV1.MainProjectsZonesService, self).__init__(client) self._upload_configs = { } @@ -503,7 +503,7 @@ def Audit(self, request, global_params=None): policies defined by GKE. Args: - request: (ContainerMasterProjectsZonesAuditRequest) input message + request: (ContainerMainProjectsZonesAuditRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuditResponse) The response message. @@ -514,13 +514,13 @@ def Audit(self, request, global_params=None): Audit.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.audit', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.audit', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/audit', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/audit', request_field=u'auditEventList', - request_type_name=u'ContainerMasterProjectsZonesAuditRequest', + request_type_name=u'ContainerMainProjectsZonesAuditRequest', response_type_name=u'AuditResponse', supports_download=False, ) @@ -535,7 +535,7 @@ def Authenticate(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authentication.k8s.io/v1beta1/types.go. Args: - request: (ContainerMasterProjectsZonesAuthenticateRequest) input message + request: (ContainerMainProjectsZonesAuthenticateRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthenticateResponse) The response message. @@ -546,13 +546,13 @@ def Authenticate(self, request, global_params=None): Authenticate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.authenticate', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.authenticate', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authenticate', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authenticate', request_field=u'authenticateRequest', - request_type_name=u'ContainerMasterProjectsZonesAuthenticateRequest', + request_type_name=u'ContainerMainProjectsZonesAuthenticateRequest', response_type_name=u'AuthenticateResponse', supports_download=False, ) @@ -567,7 +567,7 @@ def Authorize(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/authorization/v1beta1/types.go. Args: - request: (ContainerMasterProjectsZonesAuthorizeRequest) input message + request: (ContainerMainProjectsZonesAuthorizeRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (AuthorizeResponse) The response message. @@ -578,13 +578,13 @@ def Authorize(self, request, global_params=None): Authorize.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.authorize', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.authorize', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authorize', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/authorize', request_field=u'authorizeRequest', - request_type_name=u'ContainerMasterProjectsZonesAuthorizeRequest', + request_type_name=u'ContainerMainProjectsZonesAuthorizeRequest', response_type_name=u'AuthorizeResponse', supports_download=False, ) @@ -598,7 +598,7 @@ def Imagereview(self, request, global_params=None): https://github.com/kubernetes/kubernetes/blob/master/pkg/apis/imagepolicy/v1beta1/types.go. Args: - request: (ContainerMasterProjectsZonesImagereviewRequest) input message + request: (ContainerMainProjectsZonesImagereviewRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (ImageReviewResponse) The response message. @@ -609,13 +609,13 @@ def Imagereview(self, request, global_params=None): Imagereview.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.imagereview', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.imagereview', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/imagereview', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/imagereview', request_field=u'imageReviewRequest', - request_type_name=u'ContainerMasterProjectsZonesImagereviewRequest', + request_type_name=u'ContainerMainProjectsZonesImagereviewRequest', response_type_name=u'ImageReviewResponse', supports_download=False, ) @@ -636,24 +636,24 @@ def Signcertificate(self, request, global_params=None): Signcertificate.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.masterProjects.zones.signcertificate', - ordered_params=[u'masterProjectId', u'zone', u'projectNumber', u'clusterId'], - path_params=[u'clusterId', u'masterProjectId', u'projectNumber', u'zone'], + method_id=u'container.mainProjects.zones.signcertificate', + ordered_params=[u'mainProjectId', u'zone', u'projectNumber', u'clusterId'], + path_params=[u'clusterId', u'mainProjectId', u'projectNumber', u'zone'], query_params=[], - relative_path=u'v1/masterProjects/{masterProjectId}/zones/{zone}/{projectNumber}/{clusterId}/signcertificate', + relative_path=u'v1/mainProjects/{mainProjectId}/zones/{zone}/{projectNumber}/{clusterId}/signcertificate', request_field='', request_type_name=u'CertificateSigningRequest', response_type_name=u'CertificateSigningRequest', supports_download=False, ) - class MasterProjectsService(base_api.BaseApiService): - """Service class for the masterProjects resource.""" + class MainProjectsService(base_api.BaseApiService): + """Service class for the mainProjects resource.""" - _NAME = u'masterProjects' + _NAME = u'mainProjects' def __init__(self, client): - super(ContainerV1.MasterProjectsService, self).__init__(client) + super(ContainerV1.MainProjectsService, self).__init__(client) self._upload_configs = { } @@ -922,7 +922,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1212,31 +1212,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set the password. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1/{+name}:setMasterAuth', + relative_path=u'v1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1323,7 +1323,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -1376,29 +1376,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1/{+name}:updateMaster', + relative_path=u'v1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1813,7 +1813,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -2041,28 +2041,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -2145,30 +2145,30 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set the password. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -2200,7 +2200,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py index ec8f85d1..10d24a9f 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1/container_v1_messages.py @@ -28,7 +28,7 @@ class AcceleratorConfig(_messages.Message): class AckRepairWorkRequest(_messages.Message): - r"""HostedMaster sends Acknowledgment of repair work once it is received. + r"""HostedMain sends Acknowledgment of repair work once it is received. Fields: hasFailed: Whether the operation has failed. @@ -60,7 +60,7 @@ class AddonsConfig(_messages.Message): services in a cluster. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. """ @@ -238,8 +238,8 @@ class AuditEventList(_messages.Message): Fields: items: The list of events to audit log. - location: The location of this master's cluster. - zone: The zone of this master's cluster. This field is deprecated. Use + location: The location of this main's cluster. + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -251,7 +251,7 @@ class AuditEventList(_messages.Message): class AuditObjectReference(_messages.Message): r"""AuditObjectReference contains enough information to let you inspect or modify the referred object. Should match ObjectReference in https://github. - com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/apiserver/pkg/apis/ + com/kubernetes/kubernetes/blob/main/staging/src/k8s.io/apiserver/pkg/apis/ audit/v1beta1/generated.proto. Fields: @@ -282,7 +282,7 @@ class AuditResponse(_messages.Message): class AuthenticateRequest(_messages.Message): r"""A request to authenticate a user based on a provided OAuth2 token. This should look very close to the TokenReview struct in http://github.com/kubern - etes/kubernetes/blob/master/pkg/apis/authentication.k8s.io/v1beta1/types.go. + etes/kubernetes/blob/main/pkg/apis/authentication.k8s.io/v1beta1/types.go. This message has 4 GKE-specific fields that get mapped from the path, but the other fields (the expected JSON payload) must match TokenReview. @@ -290,13 +290,13 @@ class AuthenticateRequest(_messages.Message): apiVersion: The api version of the TokenReview object. kind: Fields from "pkg/apis/authentication.k8s.io/v1beta1".TokenReview: The "kind" of the TokenReview object. - location: The location of this master's cluster. + location: The location of this main's cluster. spec: The information about the request being evaluated. It contains the token that the server should authenticate. status: The response for the provided request. (this won't be filled in for an AuthenticateRequest, but it is part of the struct, so we need it here to be safe). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -311,7 +311,7 @@ class AuthenticateRequest(_messages.Message): class AuthenticateResponse(_messages.Message): r"""A response with the authenticated identity. This should match exactly with the TokenReview struct from http://github.com/kubernetes/kubernetes/blo - b/master/pkg/apis/authentication.k8s.io/types.go. + b/main/pkg/apis/authentication.k8s.io/types.go. Fields: apiVersion: The api version of the TokenReview object. @@ -385,7 +385,7 @@ class AuthorizeRequest(_messages.Message): attributes of the action the user is attempting. These attributes are mapped to a GKE IAM permission and policy to check. This should look very close to the SubjectAccessReview struct in http://github.com/kubernetes/kubernetes/bl - ob/master/pkg/apis/authorization/v1beta1/types.go. This message has 4 GKE- + ob/main/pkg/apis/authorization/v1beta1/types.go. This message has 4 GKE- specific fields that get mapped from the path, but the other fields (the expected JSON payload) must match SubjectAccessReview. @@ -393,12 +393,12 @@ class AuthorizeRequest(_messages.Message): apiVersion: The api version of the SubjectAccessReview object. kind: Fields from "pkg/apis/authorization/v1beta1".SubjectAccessReview: The "kind" of the SubjectAccessReview object. - location: The location of this master's cluster. + location: The location of this main's cluster. spec: The information about the user action being evaluated. status: The response for the provided request (this won't be filled in for an AuthorizeRequest, but it is part of the struct, so we need it here to be safe). - zone: The zone of this master's cluster. + zone: The zone of this main's cluster. """ apiVersion = _messages.StringField(1) @@ -412,7 +412,7 @@ class AuthorizeRequest(_messages.Message): class AuthorizeResponse(_messages.Message): r"""A response to a request for authorization. This should match exactly with the SubjectAccessReview struct from http://github.com/kubernetes/kubern - etes/blob/master/pkg/apis/v1beta1/authorization/types.go. + etes/blob/main/pkg/apis/v1beta1/authorization/types.go. Fields: apiVersion: The api version of the SubjectAccessReview object. @@ -492,21 +492,21 @@ class CertificateSigningRequest(_messages.Message): Fields: apiVersion: The api version of the CertificateSigningRequest object. - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. kind: The "kind" of the CertificateSigningRequest object. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the certificate is being - signed. This is the project in which this master's cluster resides. + signed. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. spec: The specification holds information about the certificate requesting to be signed. status: The status is populated at response time, and holds information about the success or failure of the operation along with the signed certificate. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -514,7 +514,7 @@ class CertificateSigningRequest(_messages.Message): clusterId = _messages.StringField(2) kind = _messages.StringField(3) location = _messages.StringField(4) - masterProjectId = _messages.StringField(5) + mainProjectId = _messages.StringField(5) projectNumber = _messages.IntegerField(6) spec = _messages.MessageField('CertificateSigningRequestSpec', 7) status = _messages.MessageField('CertificateSigningRequestStatus', 8) @@ -629,8 +629,8 @@ class Cluster(_messages.Message): automatically chosen or specify a `/14` block in `10.0.0.0/8`. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. currentNodeVersion: [Output only] The current version of the node software @@ -640,20 +640,20 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1alpha1) and features - that may not be production ready in the kubernetes version of the master - and nodes. The cluster has no SLA for uptime and master/node upgrades + that may not be production ready in the kubernetes version of the main + and nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -685,12 +685,12 @@ class Cluster(_messages.Message): cluster. * if left as an empty string,`logging.googleapis.com` will be used. maintenancePolicy: Configure the maintenance policy for this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. - masterAuthorizedNetworks: The configuration options for master authorized + mainAuthorizedNetworks: The configuration options for main authorized networks feature. This field is deprecated, use - master_authorized_networks_config instead. - masterAuthorizedNetworksConfig: The configuration options for master + main_authorized_networks_config instead. + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - @@ -746,7 +746,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -793,7 +793,7 @@ class AdditionalProperty(_messages.Message): auditConfig = _messages.MessageField('AuditConfig', 2) clusterIpv4Cidr = _messages.StringField(3) createTime = _messages.StringField(4) - currentMasterVersion = _messages.StringField(5) + currentMainVersion = _messages.StringField(5) currentNodeCount = _messages.IntegerField(6, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(7) description = _messages.StringField(8) @@ -810,9 +810,9 @@ class AdditionalProperty(_messages.Message): locations = _messages.StringField(19, repeated=True) loggingService = _messages.StringField(20) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 21) - masterAuth = _messages.MessageField('MasterAuth', 22) - masterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 23) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 24) + mainAuth = _messages.MessageField('MainAuth', 22) + mainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 23) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 24) monitoringService = _messages.StringField(25) name = _messages.StringField(26) network = _messages.StringField(27) @@ -896,18 +896,18 @@ class ClusterUpdate(_messages.Message): nodes being either created or removed from the cluster, depending on whether locations are being added or removed. This list must always include the cluster's primary zone. - desiredMasterAuthorizedNetworks: The desired configuration options for - master authorized networks feature. This field is deprecated, use - desired_master_authorized_networks_config instead. - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterId: An id of master replica to be updated. Can be set only - when desired_master_version is set. If not set, all replicas will be + desiredMainAuthorizedNetworks: The desired configuration options for + main authorized networks feature. This field is deprecated, use + desired_main_authorized_networks_config instead. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainId: An id of main replica to be updated. Can be set only + when desired_main_version is set. If not set, all replicas will be updated. - desiredMasterMachineType: The name of a Google Compute Engine [machine + desiredMainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - desiredMasterVersion: The Kubernetes version to change the master to. + main to. + desiredMainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest @@ -933,7 +933,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version """ desiredAddonsConfig = _messages.MessageField('AddonsConfig', 1) @@ -943,11 +943,11 @@ class ClusterUpdate(_messages.Message): desiredImageProject = _messages.StringField(5) desiredImageType = _messages.StringField(6) desiredLocations = _messages.StringField(7, repeated=True) - desiredMasterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 8) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 9) - desiredMasterId = _messages.StringField(10) - desiredMasterMachineType = _messages.StringField(11) - desiredMasterVersion = _messages.StringField(12) + desiredMainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 8) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 9) + desiredMainId = _messages.StringField(10) + desiredMainMachineType = _messages.StringField(11) + desiredMainVersion = _messages.StringField(12) desiredMonitoringService = _messages.StringField(13) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 14) desiredNodePoolId = _messages.StringField(15) @@ -970,7 +970,7 @@ class ClusterUpdateOptions(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -996,327 +996,327 @@ class CompleteIPRotationRequest(_messages.Message): zone = _messages.StringField(5) -class ContainerMasterProjectsLocationsAuditRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsAuditRequest object. +class ContainerMainProjectsLocationsAuditRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsAuditRequest object. Fields: auditEventList: A AuditEventList resource to be passed as the request body. - clusterId: The name of this master's cluster. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. """ auditEventList = _messages.MessageField('AuditEventList', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsAuthenticateRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsAuthenticateRequest object. +class ContainerMainProjectsLocationsAuthenticateRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsAuthenticateRequest object. Fields: authenticateRequest: A AuthenticateRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the signed URLs are being - requested. This is the project in which this master's cluster resides. + requested. This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. """ authenticateRequest = _messages.MessageField('AuthenticateRequest', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsAuthorizeRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsAuthorizeRequest object. +class ContainerMainProjectsLocationsAuthorizeRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsAuthorizeRequest object. Fields: authorizeRequest: A AuthorizeRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: This field is deprecated. Use location instead. The project number for which the request is being authorized. This is the project - in which this master's cluster resides. This is an int64, so it must be + in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. """ authorizeRequest = _messages.MessageField('AuthorizeRequest', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsImagereviewRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsImagereviewRequest object. +class ContainerMainProjectsLocationsImagereviewRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsImagereviewRequest object. Fields: - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. imageReviewRequest: A ImageReviewRequest resource to be passed as the request body. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. """ clusterId = _messages.StringField(1, required=True) imageReviewRequest = _messages.MessageField('ImageReviewRequest', 2) location = _messages.StringField(3, required=True) - masterProjectId = _messages.StringField(4, required=True) + mainProjectId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest(_messages.Message): +class ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest(_messages.Message): r"""A - ContainerMasterProjectsLocationsProjectsClustersMasterAckRepairworkRequest + ContainerMainProjectsLocationsProjectsClustersMainAckRepairworkRequest object. Fields: ackRepairWorkRequest: A AckRepairWorkRequest resource to be passed as the request body. - clusterId: Cluster name of the cluster this master manages. - location: Location of the hosted master. - masterId: Master ID of the cluster master, unique identifier. - masterProjectName: Project Name of the Hosted Master Project. - projectNumber: Project number of the cluster this master manages. + clusterId: Cluster name of the cluster this main manages. + location: Location of the hosted main. + mainId: Main ID of the cluster main, unique identifier. + mainProjectName: Project Name of the Hosted Main Project. + projectNumber: Project number of the cluster this main manages. """ ackRepairWorkRequest = _messages.MessageField('AckRepairWorkRequest', 1) clusterId = _messages.StringField(2, required=True) location = _messages.StringField(3, required=True) - masterId = _messages.StringField(4, required=True) - masterProjectName = _messages.StringField(5, required=True) + mainId = _messages.StringField(4, required=True) + mainProjectName = _messages.StringField(5, required=True) projectNumber = _messages.IntegerField(6, required=True) -class ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest(_messages.Message): +class ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest(_messages.Message): r"""A - ContainerMasterProjectsLocationsProjectsClustersMasterGetRepairworkRequest + ContainerMainProjectsLocationsProjectsClustersMainGetRepairworkRequest object. Fields: - clusterId: Cluster name of the cluster this master manages. - location: Location of the hosted master. - masterId: Master ID of the cluster master, unique identifier. - masterProjectName: Project Name of the Hosted Master Project. - projectNumber: Project number of the cluster this master manages. + clusterId: Cluster name of the cluster this main manages. + location: Location of the hosted main. + mainId: Main ID of the cluster main, unique identifier. + mainProjectName: Project Name of the Hosted Main Project. + projectNumber: Project number of the cluster this main manages. """ clusterId = _messages.StringField(1, required=True) location = _messages.StringField(2, required=True) - masterId = _messages.StringField(3, required=True) - masterProjectName = _messages.StringField(4, required=True) + mainId = _messages.StringField(3, required=True) + mainProjectName = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest(_messages.Message): +class ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest(_messages.Message): r"""A - ContainerMasterProjectsLocationsProjectsClustersNamespacesFinalizeRequest + ContainerMainProjectsLocationsProjectsClustersNamespacesFinalizeRequest object. Fields: - clusterId: Cluster name of the cluster this master manages. - location: Location of the hosted master. - masterProjectId: The hosted master project in which this master resides. + clusterId: Cluster name of the cluster this main manages. + location: Location of the hosted main. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). namespaceId: Namespace name (not uuid). - projectNumber: Project number of the cluster this master manages. + projectNumber: Project number of the cluster this main manages. """ clusterId = _messages.StringField(1, required=True) location = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) namespaceId = _messages.StringField(4, required=True) projectNumber = _messages.IntegerField(5, required=True) -class ContainerMasterProjectsLocationsSignedUrlsCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsSignedUrlsCreateRequest object. +class ContainerMainProjectsLocationsSignedUrlsCreateRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsSignedUrlsCreateRequest object. Fields: createSignedUrlsRequest: A CreateSignedUrlsRequest resource to be passed as the request body. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). """ createSignedUrlsRequest = _messages.MessageField('CreateSignedUrlsRequest', 1) location = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) -class ContainerMasterProjectsLocationsTokensCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsLocationsTokensCreateRequest object. +class ContainerMainProjectsLocationsTokensCreateRequest(_messages.Message): + r"""A ContainerMainProjectsLocationsTokensCreateRequest object. Fields: createTokenRequest: A CreateTokenRequest resource to be passed as the request body. - location: The location of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + location: The location of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). """ createTokenRequest = _messages.MessageField('CreateTokenRequest', 1) location = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) -class ContainerMasterProjectsZonesAuditRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesAuditRequest object. +class ContainerMainProjectsZonesAuditRequest(_messages.Message): + r"""A ContainerMainProjectsZonesAuditRequest object. Fields: auditEventList: A AuditEventList resource to be passed as the request body. - clusterId: The name of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ auditEventList = _messages.MessageField('AuditEventList', 1) clusterId = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesAuthenticateRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesAuthenticateRequest object. +class ContainerMainProjectsZonesAuthenticateRequest(_messages.Message): + r"""A ContainerMainProjectsZonesAuthenticateRequest object. Fields: authenticateRequest: A AuthenticateRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the signed URLs are being - requested. This is the project in which this master's cluster resides. + requested. This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ authenticateRequest = _messages.MessageField('AuthenticateRequest', 1) clusterId = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesAuthorizeRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesAuthorizeRequest object. +class ContainerMainProjectsZonesAuthorizeRequest(_messages.Message): + r"""A ContainerMainProjectsZonesAuthorizeRequest object. Fields: authorizeRequest: A AuthorizeRequest resource to be passed as the request body. - clusterId: The name of this master's cluster. - masterProjectId: The hosted master project in which this master resides. + clusterId: The name of this main's cluster. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: This field is deprecated. Use location instead. The project number for which the request is being authorized. This is the project - in which this master's cluster resides. This is an int64, so it must be + in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. - zone: The zone of this master's cluster. + zone: The zone of this main's cluster. """ authorizeRequest = _messages.MessageField('AuthorizeRequest', 1) clusterId = _messages.StringField(2, required=True) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesImagereviewRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesImagereviewRequest object. +class ContainerMainProjectsZonesImagereviewRequest(_messages.Message): + r"""A ContainerMainProjectsZonesImagereviewRequest object. Fields: - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. imageReviewRequest: A ImageReviewRequest resource to be passed as the request body. - masterProjectId: The hosted master project in which this master resides. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). projectNumber: The project number for which the request is being - authorized. This is the project in which this master's cluster resides. + authorized. This is the project in which this main's cluster resides. This is an int64, so it must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ clusterId = _messages.StringField(1, required=True) imageReviewRequest = _messages.MessageField('ImageReviewRequest', 2) - masterProjectId = _messages.StringField(3, required=True) + mainProjectId = _messages.StringField(3, required=True) projectNumber = _messages.IntegerField(4, required=True) zone = _messages.StringField(5, required=True) -class ContainerMasterProjectsZonesSignedUrlsCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesSignedUrlsCreateRequest object. +class ContainerMainProjectsZonesSignedUrlsCreateRequest(_messages.Message): + r"""A ContainerMainProjectsZonesSignedUrlsCreateRequest object. Fields: createSignedUrlsRequest: A CreateSignedUrlsRequest resource to be passed as the request body. - masterProjectId: The hosted master project in which this master resides. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ createSignedUrlsRequest = _messages.MessageField('CreateSignedUrlsRequest', 1) - masterProjectId = _messages.StringField(2, required=True) + mainProjectId = _messages.StringField(2, required=True) zone = _messages.StringField(3, required=True) -class ContainerMasterProjectsZonesTokensCreateRequest(_messages.Message): - r"""A ContainerMasterProjectsZonesTokensCreateRequest object. +class ContainerMainProjectsZonesTokensCreateRequest(_messages.Message): + r"""A ContainerMainProjectsZonesTokensCreateRequest object. Fields: createTokenRequest: A CreateTokenRequest resource to be passed as the request body. - masterProjectId: The hosted master project in which this master resides. + mainProjectId: The hosted main project in which this main resides. This can be either a [project ID or project number](https://support.google.com/cloud/answer/6158840). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ createTokenRequest = _messages.MessageField('CreateTokenRequest', 1) - masterProjectId = _messages.StringField(2, required=True) + mainProjectId = _messages.StringField(2, required=True) zone = _messages.StringField(3, required=True) @@ -1820,17 +1820,17 @@ class CreateNodePoolRequest(_messages.Message): class CreateSignedUrlsRequest(_messages.Message): r"""A request for signed URLs that allow for writing a file to a private GCS - bucket for storing backups of hosted master data. + bucket for storing backups of hosted main data. Fields: - clusterId: The name of this master's cluster. + clusterId: The name of this main's cluster. filenames: The names of the files for which a signed URLs are being requested. - location: The location of this master's cluster. + location: The location of this main's cluster. projectNumber: The project number for which the signed URLs are being - requested. This is the project in which this master's cluster resides. + requested. This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -1844,16 +1844,16 @@ class CreateSignedUrlsRequest(_messages.Message): class CreateTokenRequest(_messages.Message): r"""A request for a compute-read-write (https://www.googleapis.com/auth/compute) scoped OAuth2 access token for - , to allow hosted masters to make modifications to a user's + , to allow hosted mains to make modifications to a user's project. Fields: - clusterId: The name of this master's cluster. - location: The location of this master's cluster. + clusterId: The name of this main's cluster. + location: The location of this main's cluster. projectNumber: The project number for which the access is being requested. - This is the project in which this master's cluster resides. Note that + This is the project in which this main's cluster resides. Note that this must be a project number, not a project ID. - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -1908,28 +1908,28 @@ class Empty(_messages.Message): class GetRepairWorkResponse(_messages.Message): - r"""Response sent back to the Hosted Master detailing if there is work, and + r"""Response sent back to the Hosted Main detailing if there is work, and if so, what kind of work to do. Enums: - RepairTypeValueValuesEnum: The type of repair for this master. + RepairTypeValueValuesEnum: The type of repair for this main. Fields: clearEventEtcdDetails: clear_event_etcd_details token to be used when clearing event etcd. Required for CLEAR_EVENT_ETCD repair. repairId: Repair ID of the returned repair. - repairType: The type of repair for this master. + repairType: The type of repair for this main. restoreEtcdDetails: restore_etcd_details describes what backup should be used in RESTORE_ETCD. Required for repair_type = RESTORE_ETCD. """ class RepairTypeValueValuesEnum(_messages.Enum): - r"""The type of repair for this master. + r"""The type of repair for this main. Values: UNKNOWN: Unknown Repair Type. REBOOT: A VM Reboot is required. - IN_PLACE: An in place master repair is required. + IN_PLACE: An in place main repair is required. NONE: No Repair is required RESTORE_ETCD: Restore etcd from backup. CLEAR_EVENT_ETCD: Clear event etcd. @@ -2054,7 +2054,7 @@ class ImageReviewRequest(_messages.Message): r"""A request to verify an image. The request contains the attributes of the container to create. These are passed to BCID for verification. This should look very close to the ImageReview struct in http://github.com/kubernetes/ku - bernetes/blob/master/pkg/apis/imagepolicy/v1beta1/types.go. This message has + bernetes/blob/main/pkg/apis/imagepolicy/v1beta1/types.go. This message has 4 GKE-specific fields that get mapped from the path, but the other fields (the expected JSON payload) must match ImageReview. @@ -2062,12 +2062,12 @@ class ImageReviewRequest(_messages.Message): apiVersion: The api version of the SubjectAccessReview object. kind: Fields from "pkg/apis/authorization/v1beta1".SubjectAccessReview: The "kind" of the SubjectAccessReview object. - location: The location of this master's cluster. + location: The location of this main's cluster. spec: The information about the user action being evaluated. status: The response for the provided request (this won't be filled in for an AuthorizeRequest, but it is part of the struct, so we need it here to be safe). - zone: The zone of this master's cluster. This field is deprecated. Use + zone: The zone of this main's cluster. This field is deprecated. Use location instead. """ @@ -2082,7 +2082,7 @@ class ImageReviewRequest(_messages.Message): class ImageReviewResponse(_messages.Message): r"""A response to a request for image verification. This should match exactly with the ImageReview struct from http://github.com/kubernetes/kubern - etes/blob/master/pkg/apis/v1beta1/authorization/types.go. + etes/blob/main/pkg/apis/v1beta1/authorization/types.go. Fields: apiVersion: The api version of the ImageReview object. @@ -2255,8 +2255,8 @@ class MaintenanceWindow(_messages.Message): dailyMaintenanceWindow = _messages.MessageField('DailyMaintenanceWindow', 1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -2270,11 +2270,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, you can disable basic authentication by providing an empty username. """ @@ -2287,33 +2287,33 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworks(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworks(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. This message - is deprecated, use MasterAuthorizedNetworksConfig instead. + is deprecated, use MainAuthorizedNetworksConfig instead. Fields: cidrs: Network CIDRs define up to 10 external networks that could access - Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrs = _messages.MessageField('CIDR', 1, repeated=True) enabled = _messages.BooleanField(2) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -2323,7 +2323,7 @@ class MasterAuthorizedNetworksConfig(_messages.Message): class MetaV1Status(_messages.Message): r"""MetaV1Status is a return value for calls that don't return other objects. Should match Status in https://github.com/kubernetes/kubernetes/bl - ob/master/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto. + ob/main/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto. Fields: code: Suggested HTTP return code for this status, 0 if not set. +optional @@ -2363,7 +2363,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -2579,7 +2579,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2717,7 +2717,7 @@ class ObjectMeta(_messages.Message): r"""ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create. Only one field is used from this proto in AuditEvent. Should match ObjectMeta in https://github.com/kubernet - es/kubernetes/blob/master/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/g + es/kubernetes/blob/main/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/g enerated.proto Fields: @@ -2770,7 +2770,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2780,7 +2780,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2909,7 +2909,7 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ @@ -2917,7 +2917,7 @@ class ServerConfig(_messages.Message): defaultClusterVersion = _messages.StringField(2) defaultImageType = _messages.StringField(3) validImageTypes = _messages.StringField(4, repeated=True) - validMasterVersions = _messages.StringField(5, repeated=True) + validMainVersions = _messages.StringField(5, repeated=True) validNodeVersions = _messages.StringField(6, repeated=True) @@ -3125,15 +3125,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(6) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -3149,7 +3149,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -3169,7 +3169,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) version = _messages.StringField(6) zone = _messages.StringField(7) @@ -3325,7 +3325,7 @@ class SetNodePoolSizeRequest(_messages.Message): class SignedUrls(_messages.Message): r"""Signed URLs that allow for writing a file to a private GCS bucket for - storing backups of hosted master data. + storing backups of hosted main data. Fields: signedUrls: The signed URLs for writing the request files, in the same @@ -3539,7 +3539,7 @@ class SubjectAccessReviewStatus(_messages.Message): class Token(_messages.Message): r"""A compute-read-write (https://www.googleapis.com/auth/compute) scoped - OAuth2 access token, to allow hosted masters to make modifications to a + OAuth2 access token, to allow hosted mains to make modifications to a user's project. Fields: @@ -3604,16 +3604,16 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(7) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterMachineType: The name of a Google Compute Engine [machine + mainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - masterVersion: The Kubernetes version to change the master to. Users may + main to. + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -3632,8 +3632,8 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterMachineType = _messages.StringField(2) - masterVersion = _messages.StringField(3) + mainMachineType = _messages.StringField(2) + mainVersion = _messages.StringField(3) name = _messages.StringField(4) projectId = _messages.StringField(5) version = _messages.StringField(6) @@ -3662,7 +3662,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py index c069ffe1..f2ec6fb0 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_client.py @@ -359,7 +359,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -649,32 +649,32 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1alpha1/{+name}:setMasterAuth', + relative_path=u'v1alpha1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -761,7 +761,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -814,29 +814,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1alpha1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1alpha1/{+name}:updateMaster', + relative_path=u'v1alpha1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1278,7 +1278,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1506,28 +1506,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1610,31 +1610,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1alpha1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1666,7 +1666,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py index d0d2d866..44bad32a 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1alpha1/container_v1alpha1_messages.py @@ -42,7 +42,7 @@ class AddonsConfig(_messages.Message): and secure microservices. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. serverlessConfig: Configuration for the serverless addon. The `IstioConfig` addon must be enabled in order to enable serverless. This @@ -234,8 +234,8 @@ class Cluster(_messages.Message): conditions: Which conditions caused the current cluster state. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. currentNodeVersion: [Output only] The current version of the node software @@ -251,24 +251,24 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1alpha1) and features - that may not be production ready in the kubernetes version of the master - and nodes. The cluster has no SLA for uptime and master/node upgrades + that may not be production ready in the kubernetes version of the main + and nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. enableNamespaceLevelIam: If this cluster supports namespace-level IAM policies. Clusters that support namespace-level IAM may have IAM policies set on their namespaces using SetIamPolicy. enableTpu: Enable the ability to use Cloud TPUs in this cluster. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -302,16 +302,16 @@ class Cluster(_messages.Message): maintenancePolicy: Configure the maintenance policy for this cluster. managedPodIdentityConfig: Configuration for the use of GCP IAM Service Accounts in applications in this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. - masterAuthorizedNetworks: The configuration options for master authorized + mainAuthorizedNetworks: The configuration options for main authorized networks feature. This field is deprecated, use - master_authorized_networks_config instead. - masterAuthorizedNetworksConfig: The configuration options for master + main_authorized_networks_config instead. + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. - masterIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted - master network. This prefix will be used for assigning private IP - addresses to the master or set of masters, as well as the ILB VIP. + mainIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted + main network. This prefix will be used for assigning private IP + addresses to the main or set of mains, as well as the ILB VIP. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - the Google Cloud Monitoring service. * `none` - no metrics will be @@ -342,7 +342,7 @@ class Cluster(_messages.Message): podSecurityPolicyConfig: Configuration for the PodSecurityPolicy feature. privateCluster: If this is a private cluster setup. Private clusters are clusters that, by default have no external IP addresses on the nodes and - where nodes and the master communicate over private IP addresses. + where nodes and the main communicate over private IP addresses. resourceLabels: The resource labels for the cluster to use to annotate any related GCE resources. resourceUsageExportConfig: Configuration for exporting resource usages. @@ -377,7 +377,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -428,7 +428,7 @@ class AdditionalProperty(_messages.Message): clusterIpv4Cidr = _messages.StringField(6) conditions = _messages.MessageField('StatusCondition', 7, repeated=True) createTime = _messages.StringField(8) - currentMasterVersion = _messages.StringField(9) + currentMainVersion = _messages.StringField(9) currentNodeCount = _messages.IntegerField(10, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(11) databaseEncryptionKeyId = _messages.StringField(12) @@ -450,10 +450,10 @@ class AdditionalProperty(_messages.Message): loggingService = _messages.StringField(28) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 29) managedPodIdentityConfig = _messages.MessageField('ManagedPodIdentityConfig', 30) - masterAuth = _messages.MessageField('MasterAuth', 31) - masterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 32) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 33) - masterIpv4CidrBlock = _messages.StringField(34) + mainAuth = _messages.MessageField('MainAuth', 31) + mainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 32) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 33) + mainIpv4CidrBlock = _messages.StringField(34) monitoringService = _messages.StringField(35) name = _messages.StringField(36) network = _messages.StringField(37) @@ -568,18 +568,18 @@ class ClusterUpdate(_messages.Message): with Kubernetes-native resource model in Stackdriver * "logging.googleapis.com" - the Google Cloud Logging service * "none" - no logs will be exported from the cluster - desiredMasterAuthorizedNetworks: The desired configuration options for - master authorized networks feature. This field is deprecated, use - desired_master_authorized_networks_config instead. - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterId: An id of master replica to be updated. Can be set only - when desired_master_version is set. If not set, all replicas will be + desiredMainAuthorizedNetworks: The desired configuration options for + main authorized networks feature. This field is deprecated, use + desired_main_authorized_networks_config instead. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainId: An id of main replica to be updated. Can be set only + when desired_main_version is set. If not set, all replicas will be updated. - desiredMasterMachineType: The name of a Google Compute Engine [machine + desiredMainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - desiredMasterVersion: The Kubernetes version to change the master to. + main to. + desiredMainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest @@ -607,7 +607,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version desiredPodSecurityPolicyConfig: The desired configuration options for the PodSecurityPolicy feature. desiredUseIpAliases: The desired use of IP aliases in a cluster. @@ -624,11 +624,11 @@ class ClusterUpdate(_messages.Message): desiredImageType = _messages.StringField(9) desiredLocations = _messages.StringField(10, repeated=True) desiredLoggingService = _messages.StringField(11) - desiredMasterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 12) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 13) - desiredMasterId = _messages.StringField(14) - desiredMasterMachineType = _messages.StringField(15) - desiredMasterVersion = _messages.StringField(16) + desiredMainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 12) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 13) + desiredMainId = _messages.StringField(14) + desiredMainMachineType = _messages.StringField(15) + desiredMainVersion = _messages.StringField(16) desiredMonitoringService = _messages.StringField(17) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 18) desiredNodePoolId = _messages.StringField(19) @@ -653,7 +653,7 @@ class ClusterUpdateOptions(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -2154,8 +2154,8 @@ class ManagedPodIdentityConfig(_messages.Message): enabled = _messages.BooleanField(1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -2169,11 +2169,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, you can disable basic authentication by providing an empty username. """ @@ -2186,33 +2186,33 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworks(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworks(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. This message - is deprecated, use MasterAuthorizedNetworksConfig instead. + is deprecated, use MainAuthorizedNetworksConfig instead. Fields: cidrs: Network CIDRs define up to 10 external networks that could access - Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrs = _messages.MessageField('CIDR', 1, repeated=True) enabled = _messages.BooleanField(2) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -2291,7 +2291,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -2508,7 +2508,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2676,7 +2676,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2686,7 +2686,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2859,7 +2859,7 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ @@ -2867,7 +2867,7 @@ class ServerConfig(_messages.Message): defaultClusterVersion = _messages.StringField(2) defaultImageType = _messages.StringField(3) validImageTypes = _messages.StringField(4, repeated=True) - validMasterVersions = _messages.StringField(5, repeated=True) + validMainVersions = _messages.StringField(5, repeated=True) validNodeVersions = _messages.StringField(6, repeated=True) @@ -3085,15 +3085,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(6) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -3109,7 +3109,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -3129,7 +3129,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) version = _messages.StringField(6) zone = _messages.StringField(7) @@ -3430,16 +3430,16 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(7) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterMachineType: The name of a Google Compute Engine [machine + mainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - masterVersion: The Kubernetes version to change the master to. Users may + main to. + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -3457,8 +3457,8 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterMachineType = _messages.StringField(2) - masterVersion = _messages.StringField(3) + mainMachineType = _messages.StringField(2) + mainVersion = _messages.StringField(3) name = _messages.StringField(4) projectId = _messages.StringField(5) version = _messages.StringField(6) @@ -3487,7 +3487,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py index 2368fa42..9dd9c8ef 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_client.py @@ -359,7 +359,7 @@ def __init__(self, client): } def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -649,32 +649,32 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMasterAuth', + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:setMainAuth', http_method=u'POST', - method_id=u'container.projects.locations.clusters.setMasterAuth', + method_id=u'container.projects.locations.clusters.setMainAuth', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1beta1/{+name}:setMasterAuth', + relative_path=u'v1beta1/{+name}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -761,7 +761,7 @@ def SetResourceLabels(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message @@ -814,29 +814,29 @@ def Update(self, request, global_params=None): supports_download=False, ) - def UpdateMaster(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def UpdateMain(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('UpdateMaster') + config = self.GetMethodConfig('UpdateMain') return self._RunMethod( config, request, global_params=global_params) - UpdateMaster.method_config = lambda: base_api.ApiMethodInfo( - flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMaster', + UpdateMain.method_config = lambda: base_api.ApiMethodInfo( + flat_path=u'v1beta1/projects/{projectsId}/locations/{locationsId}/clusters/{clustersId}:updateMain', http_method=u'POST', - method_id=u'container.projects.locations.clusters.updateMaster', + method_id=u'container.projects.locations.clusters.updateMain', ordered_params=[u'name'], path_params=[u'name'], query_params=[], - relative_path=u'v1beta1/{+name}:updateMaster', + relative_path=u'v1beta1/{+name}:updateMain', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1278,7 +1278,7 @@ def Addons(self, request, global_params=None): ) def CompleteIpRotation(self, request, global_params=None): - r"""Completes master IP rotation. + r"""Completes main IP rotation. Args: request: (CompleteIPRotationRequest) input message @@ -1506,28 +1506,28 @@ def Logging(self, request, global_params=None): supports_download=False, ) - def Master(self, request, global_params=None): - r"""Updates the master for a specific cluster. + def Main(self, request, global_params=None): + r"""Updates the main for a specific cluster. Args: - request: (UpdateMasterRequest) input message + request: (UpdateMainRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('Master') + config = self.GetMethodConfig('Main') return self._RunMethod( config, request, global_params=global_params) - Master.method_config = lambda: base_api.ApiMethodInfo( + Main.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.master', + method_id=u'container.projects.zones.clusters.main', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/master', + relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}/main', request_field='', - request_type_name=u'UpdateMasterRequest', + request_type_name=u'UpdateMainRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1610,31 +1610,31 @@ def SetMaintenancePolicy(self, request, global_params=None): supports_download=False, ) - def SetMasterAuth(self, request, global_params=None): - r"""Used to set master auth materials. Currently supports :-. + def SetMainAuth(self, request, global_params=None): + r"""Used to set main auth materials. Currently supports :-. Changing the admin password for a specific cluster. This can be either via password generation or explicitly set. Modify basic_auth.csv and reset the K8S API server. Args: - request: (SetMasterAuthRequest) input message + request: (SetMainAuthRequest) input message global_params: (StandardQueryParameters, default: None) global arguments Returns: (Operation) The response message. """ - config = self.GetMethodConfig('SetMasterAuth') + config = self.GetMethodConfig('SetMainAuth') return self._RunMethod( config, request, global_params=global_params) - SetMasterAuth.method_config = lambda: base_api.ApiMethodInfo( + SetMainAuth.method_config = lambda: base_api.ApiMethodInfo( http_method=u'POST', - method_id=u'container.projects.zones.clusters.setMasterAuth', + method_id=u'container.projects.zones.clusters.setMainAuth', ordered_params=[u'projectId', u'zone', u'clusterId'], path_params=[u'clusterId', u'projectId', u'zone'], query_params=[], - relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMasterAuth', + relative_path=u'v1beta1/projects/{projectId}/zones/{zone}/clusters/{clusterId}:setMainAuth', request_field='', - request_type_name=u'SetMasterAuthRequest', + request_type_name=u'SetMainAuthRequest', response_type_name=u'Operation', supports_download=False, ) @@ -1666,7 +1666,7 @@ def SetNetworkPolicy(self, request, global_params=None): ) def StartIpRotation(self, request, global_params=None): - r"""Start master IP rotation. + r"""Start main IP rotation. Args: request: (StartIPRotationRequest) input message diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py index 2cd1c6ad..c8011b0f 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/container/v1beta1/container_v1beta1_messages.py @@ -40,7 +40,7 @@ class AddonsConfig(_messages.Message): services in a cluster. kubernetesDashboard: Configuration for the Kubernetes Dashboard. networkPolicyConfig: Configuration for NetworkPolicy. This only tracks - whether the addon is enabled or not on the Master, it does not track + whether the addon is enabled or not on the Main, it does not track whether network policy is enabled for the nodes. """ @@ -202,8 +202,8 @@ class Cluster(_messages.Message): automatically chosen or specify a `/14` block in `10.0.0.0/8`. createTime: [Output only] The time the cluster was created, in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. - currentMasterVersion: [Output only] The current software version of the - master endpoint. + currentMainVersion: [Output only] The current software version of the + main endpoint. currentNodeCount: [Output only] The number of nodes currently in the cluster. currentNodeVersion: [Output only] The current version of the node software @@ -213,21 +213,21 @@ class Cluster(_messages.Message): description: An optional description of this cluster. enableKubernetesAlpha: Kubernetes alpha features are enabled on this cluster. This includes alpha API groups (e.g. v1beta1) and features that - may not be production ready in the kubernetes version of the master and - nodes. The cluster has no SLA for uptime and master/node upgrades are + may not be production ready in the kubernetes version of the main and + nodes. The cluster has no SLA for uptime and main/node upgrades are disabled. Alpha enabled clusters are automatically deleted thirty days after creation. enableTpu: Enable the ability to use Cloud TPUs in this cluster. - endpoint: [Output only] The IP address of this cluster's master endpoint. + endpoint: [Output only] The IP address of this cluster's main endpoint. The endpoint can be accessed from the internet at - `https://username:password@endpoint/`. See the `masterAuth` property of + `https://username:password@endpoint/`. See the `mainAuth` property of this resource for username and password information. expireTime: [Output only] The time the cluster will be automatically deleted in [RFC3339](https://www.ietf.org/rfc/rfc3339.txt) text format. initialClusterVersion: The initial Kubernetes version for this cluster. - Valid versions are those found in validMasterVersions returned by + Valid versions are those found in validMainVersions returned by getServerConfig. The version can be upgraded over time; such upgrades - are reflected in currentMasterVersion and currentNodeVersion. Users may + are reflected in currentMainVersion and currentNodeVersion. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -259,16 +259,16 @@ class Cluster(_messages.Message): cluster. * if left as an empty string,`logging.googleapis.com` will be used. maintenancePolicy: Configure the maintenance policy for this cluster. - masterAuth: The authentication information for accessing the master + mainAuth: The authentication information for accessing the main endpoint. - masterAuthorizedNetworks: The configuration options for master authorized + mainAuthorizedNetworks: The configuration options for main authorized networks feature. This field is deprecated, use - master_authorized_networks_config instead. - masterAuthorizedNetworksConfig: The configuration options for master + main_authorized_networks_config instead. + mainAuthorizedNetworksConfig: The configuration options for main authorized networks feature. - masterIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted - master network. This prefix will be used for assigning private IP - addresses to the master or set of masters, as well as the ILB VIP. + mainIpv4CidrBlock: The IP prefix in CIDR notation to use for the hosted + main network. This prefix will be used for assigning private IP + addresses to the main or set of mains, as well as the ILB VIP. monitoringService: The monitoring service the cluster should use to write metrics. Currently available options: * `monitoring.googleapis.com` - the Google Cloud Monitoring service. * `none` - no metrics will be @@ -300,7 +300,7 @@ class Cluster(_messages.Message): podSecurityPolicyConfig: Configuration for the PodSecurityPolicy feature. privateCluster: If this is a private cluster setup. Private clusters are clusters that, by default have no external IP addresses on the nodes and - where nodes and the master communicate over private IP addresses. + where nodes and the main communicate over private IP addresses. resourceLabels: The resource labels for the cluster to use to annotate any related Google Compute Engine resources. selfLink: [Output only] Server-defined URL for the resource. @@ -332,7 +332,7 @@ class StatusValueValuesEnum(_messages.Enum): RUNNING: The RUNNING state indicates the cluster has been created and is fully usable. RECONCILING: The RECONCILING state indicates that some work is actively - being done on the cluster, such as upgrading the master or node + being done on the cluster, such as upgrading the main or node software. Details can be found in the `statusMessage` field. STOPPING: The STOPPING state indicates the cluster is being deleted. ERROR: The ERROR state indicates the cluster may be unusable. Details @@ -381,7 +381,7 @@ class AdditionalProperty(_messages.Message): binaryAuthorization = _messages.MessageField('BinaryAuthorization', 4) clusterIpv4Cidr = _messages.StringField(5) createTime = _messages.StringField(6) - currentMasterVersion = _messages.StringField(7) + currentMainVersion = _messages.StringField(7) currentNodeCount = _messages.IntegerField(8, variant=_messages.Variant.INT32) currentNodeVersion = _messages.StringField(9) description = _messages.StringField(10) @@ -399,10 +399,10 @@ class AdditionalProperty(_messages.Message): locations = _messages.StringField(22, repeated=True) loggingService = _messages.StringField(23) maintenancePolicy = _messages.MessageField('MaintenancePolicy', 24) - masterAuth = _messages.MessageField('MasterAuth', 25) - masterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 26) - masterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 27) - masterIpv4CidrBlock = _messages.StringField(28) + mainAuth = _messages.MessageField('MainAuth', 25) + mainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 26) + mainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 27) + mainIpv4CidrBlock = _messages.StringField(28) monitoringService = _messages.StringField(29) name = _messages.StringField(30) network = _messages.StringField(31) @@ -510,18 +510,18 @@ class ClusterUpdate(_messages.Message): with Kubernetes-native resource model in Stackdriver * "logging.googleapis.com" - the Google Cloud Logging service * "none" - no logs will be exported from the cluster - desiredMasterAuthorizedNetworks: The desired configuration options for - master authorized networks feature. This field is deprecated, use - desired_master_authorized_networks_config instead. - desiredMasterAuthorizedNetworksConfig: The desired configuration options - for master authorized networks feature. - desiredMasterId: An id of master replica to be updated. Can be set only - when desired_master_version is set. If not set, all replicas will be + desiredMainAuthorizedNetworks: The desired configuration options for + main authorized networks feature. This field is deprecated, use + desired_main_authorized_networks_config instead. + desiredMainAuthorizedNetworksConfig: The desired configuration options + for main authorized networks feature. + desiredMainId: An id of main replica to be updated. Can be set only + when desired_main_version is set. If not set, all replicas will be updated. - desiredMasterMachineType: The name of a Google Compute Engine [machine + desiredMainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - desiredMasterVersion: The Kubernetes version to change the master to. The + main to. + desiredMainVersion: The Kubernetes version to change the main to. The only valid value is the latest supported version. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the @@ -550,7 +550,7 @@ class ClusterUpdate(_messages.Message): version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": picks an explicit Kubernetes version - "-": - picks the Kubernetes master version + picks the Kubernetes main version desiredPodSecurityPolicyConfig: The desired configuration options for the PodSecurityPolicy feature. """ @@ -566,11 +566,11 @@ class ClusterUpdate(_messages.Message): desiredImageType = _messages.StringField(9) desiredLocations = _messages.StringField(10, repeated=True) desiredLoggingService = _messages.StringField(11) - desiredMasterAuthorizedNetworks = _messages.MessageField('MasterAuthorizedNetworks', 12) - desiredMasterAuthorizedNetworksConfig = _messages.MessageField('MasterAuthorizedNetworksConfig', 13) - desiredMasterId = _messages.StringField(14) - desiredMasterMachineType = _messages.StringField(15) - desiredMasterVersion = _messages.StringField(16) + desiredMainAuthorizedNetworks = _messages.MessageField('MainAuthorizedNetworks', 12) + desiredMainAuthorizedNetworksConfig = _messages.MessageField('MainAuthorizedNetworksConfig', 13) + desiredMainId = _messages.StringField(14) + desiredMainMachineType = _messages.StringField(15) + desiredMainVersion = _messages.StringField(16) desiredMonitoringService = _messages.StringField(17) desiredNodePoolAutoscaling = _messages.MessageField('NodePoolAutoscaling', 18) desiredNodePoolId = _messages.StringField(19) @@ -594,7 +594,7 @@ class ClusterUpdateOptions(_messages.Message): class CompleteIPRotationRequest(_messages.Message): - r"""CompleteIPRotationRequest moves the cluster master back into single-IP + r"""CompleteIPRotationRequest moves the cluster main back into single-IP mode. Fields: @@ -2024,8 +2024,8 @@ class MaintenanceWindow(_messages.Message): dailyMaintenanceWindow = _messages.MessageField('DailyMaintenanceWindow', 1) -class MasterAuth(_messages.Message): - r"""The authentication information for accessing the master endpoint. +class MainAuth(_messages.Message): + r"""The authentication information for accessing the main endpoint. Authentication can be done using HTTP basic auth or using client certificates. @@ -2039,11 +2039,11 @@ class MasterAuth(_messages.Message): authenticate to the cluster endpoint. clusterCaCertificate: [Output only] Base64-encoded public certificate that is the root of trust for the cluster. - password: The password to use for HTTP basic authentication to the master - endpoint. Because the master endpoint is open to the Internet, you + password: The password to use for HTTP basic authentication to the main + endpoint. Because the main endpoint is open to the Internet, you should create a strong password. If a password is provided for cluster creation, username must be non-empty. - username: The username to use for HTTP basic authentication to the master + username: The username to use for HTTP basic authentication to the main endpoint. For clusters v1.6.0 and later, you can disable basic authentication by providing an empty username. """ @@ -2056,33 +2056,33 @@ class MasterAuth(_messages.Message): username = _messages.StringField(6) -class MasterAuthorizedNetworks(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworks(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. This message - is deprecated, use MasterAuthorizedNetworksConfig instead. + is deprecated, use MainAuthorizedNetworksConfig instead. Fields: cidrs: Network CIDRs define up to 10 external networks that could access - Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrs = _messages.MessageField('CIDR', 1, repeated=True) enabled = _messages.BooleanField(2) -class MasterAuthorizedNetworksConfig(_messages.Message): - r"""Configuration options for the master authorized networks feature. - Enabled master authorized networks will disallow all external traffic to - access Kubernetes master through HTTPS except traffic from the given CIDR +class MainAuthorizedNetworksConfig(_messages.Message): + r"""Configuration options for the main authorized networks feature. + Enabled main authorized networks will disallow all external traffic to + access Kubernetes main through HTTPS except traffic from the given CIDR blocks, Google Compute Engine Public IPs and Google Prod IPs. Fields: cidrBlocks: cidr_blocks define up to 10 external networks that could - access Kubernetes master through HTTPS. - enabled: Whether or not master authorized networks is enabled. + access Kubernetes main through HTTPS. + enabled: Whether or not main authorized networks is enabled. """ cidrBlocks = _messages.MessageField('CidrBlock', 1, repeated=True) @@ -2150,7 +2150,7 @@ class ProviderValueValuesEnum(_messages.Enum): class NetworkPolicyConfig(_messages.Message): r"""Configuration for NetworkPolicy. This only tracks whether the addon is - enabled or not on the Master, it does not track whether network policy is + enabled or not on the Main, it does not track whether network policy is enabled for the nodes. Fields: @@ -2364,7 +2364,7 @@ class NodeManagement(_messages.Message): class NodePool(_messages.Message): r"""NodePool contains the name and configuration for a cluster's node pool. Node pools are a set of nodes (i.e. VM's), with a common configuration and - specification, under the control of the cluster master. They may have a set + specification, under the control of the cluster main. They may have a set of Kubernetes labels applied to them, which may be used to reference them during pod scheduling. They may also be resized up or down, to accommodate the workload. @@ -2524,7 +2524,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): TYPE_UNSPECIFIED: Not set. CREATE_CLUSTER: Cluster create. DELETE_CLUSTER: Cluster delete. - UPGRADE_MASTER: A master upgrade. + UPGRADE_MASTER: A main upgrade. UPGRADE_NODES: A node upgrade. REPAIR_CLUSTER: Cluster repair. UPDATE_CLUSTER: Cluster update. @@ -2534,7 +2534,7 @@ class OperationTypeValueValuesEnum(_messages.Enum): AUTO_REPAIR_NODES: Automatic node pool repair. AUTO_UPGRADE_NODES: Automatic node upgrade. SET_LABELS: Set labels. - SET_MASTER_AUTH: Set/generate master auth materials + SET_MASTER_AUTH: Set/generate main auth materials SET_NODE_POOL_SIZE: Set node pool size. SET_NETWORK_POLICY: Updates network policy for a cluster. SET_MAINTENANCE_POLICY: Set the maintenance policy. @@ -2692,7 +2692,7 @@ class ServerConfig(_messages.Message): default. defaultImageType: Default image type. validImageTypes: List of valid image types. - validMasterVersions: List of valid master versions. + validMainVersions: List of valid main versions. validNodeVersions: List of valid node upgrade target versions. """ @@ -2700,7 +2700,7 @@ class ServerConfig(_messages.Message): defaultClusterVersion = _messages.StringField(2) defaultImageType = _messages.StringField(3) validImageTypes = _messages.StringField(4, repeated=True) - validMasterVersions = _messages.StringField(5, repeated=True) + validMainVersions = _messages.StringField(5, repeated=True) validNodeVersions = _messages.StringField(6, repeated=True) @@ -2908,15 +2908,15 @@ class SetMaintenancePolicyRequest(_messages.Message): zone = _messages.StringField(6) -class SetMasterAuthRequest(_messages.Message): - r"""SetMasterAuthRequest updates the admin password of a cluster. +class SetMainAuthRequest(_messages.Message): + r"""SetMainAuthRequest updates the admin password of a cluster. Enums: - ActionValueValuesEnum: The exact form of action to be taken on the master + ActionValueValuesEnum: The exact form of action to be taken on the main auth. Fields: - action: The exact form of action to be taken on the master auth. + action: The exact form of action to be taken on the main auth. clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. name: The name (project, location, cluster) of the cluster to set auth. @@ -2932,7 +2932,7 @@ class SetMasterAuthRequest(_messages.Message): """ class ActionValueValuesEnum(_messages.Enum): - r"""The exact form of action to be taken on the master auth. + r"""The exact form of action to be taken on the main auth. Values: UNKNOWN: Operation is unknown and will error out. @@ -2952,7 +2952,7 @@ class ActionValueValuesEnum(_messages.Enum): clusterId = _messages.StringField(2) name = _messages.StringField(3) projectId = _messages.StringField(4) - update = _messages.MessageField('MasterAuth', 5) + update = _messages.MessageField('MainAuth', 5) version = _messages.StringField(6) zone = _messages.StringField(7) @@ -3254,16 +3254,16 @@ class UpdateClusterRequest(_messages.Message): zone = _messages.StringField(7) -class UpdateMasterRequest(_messages.Message): - r"""UpdateMasterRequest updates the master of the cluster. +class UpdateMainRequest(_messages.Message): + r"""UpdateMainRequest updates the main of the cluster. Fields: clusterId: Deprecated. The name of the cluster to upgrade. This field has been deprecated and replaced by the name field. - masterMachineType: The name of a Google Compute Engine [machine + mainMachineType: The name of a Google Compute Engine [machine type](/compute/docs/machine-types) (e.g. `n1-standard-8`) to change the - master to. - masterVersion: The Kubernetes version to change the master to. Users may + main to. + mainVersion: The Kubernetes version to change the main to. Users may specify either explicit versions offered by Kubernetes Engine or version aliases, which have the following behavior: - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid @@ -3282,8 +3282,8 @@ class UpdateMasterRequest(_messages.Message): """ clusterId = _messages.StringField(1) - masterMachineType = _messages.StringField(2) - masterVersion = _messages.StringField(3) + mainMachineType = _messages.StringField(2) + mainVersion = _messages.StringField(3) name = _messages.StringField(4) projectId = _messages.StringField(5) version = _messages.StringField(6) @@ -3312,7 +3312,7 @@ class UpdateNodePoolRequest(_messages.Message): - "latest": picks the highest valid Kubernetes version - "1.X": picks the highest valid patch+gke.N patch in the 1.X version - "1.X.Y": picks the highest valid gke.N patch in the 1.X.Y version - "1.X.Y-gke.N": - picks an explicit Kubernetes version - "-": picks the Kubernetes master + picks an explicit Kubernetes version - "-": picks the Kubernetes main version projectId: Deprecated. The Google Developers Console [project ID or project number](https://support.google.com/cloud/answer/6158840). This diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py index 65b3bb26..db4958aa 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1/dataproc_v1_messages.py @@ -124,14 +124,14 @@ class ClusterConfig(_messages.Message): gceClusterConfig: Required. The shared Compute Engine config settings for all instances in a cluster. initializationActions: Optional. Commands to execute on each node after - config is completed. By default, executables are run on master and all + config is completed. By default, executables are run on main and all worker nodes. You can test a node's role metadata to run an executable - on a master or worker node, as shown below using curl (you can also use + on a main or worker node, as shown below using curl (you can also use wget): ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1/instance/attributes/dataproc-role) if - [[ "${ROLE}" == 'Master' ]]; then ... master specific actions ... else + [[ "${ROLE}" == 'Main' ]]; then ... main specific actions ... else ... worker specific actions ... fi - masterConfig: Optional. The Compute Engine config settings for the master + mainConfig: Optional. The Compute Engine config settings for the main instance in a cluster. secondaryWorkerConfig: Optional. The Compute Engine config settings for additional worker instances in a cluster. @@ -144,7 +144,7 @@ class ClusterConfig(_messages.Message): configBucket = _messages.StringField(1) gceClusterConfig = _messages.MessageField('GceClusterConfig', 2) initializationActions = _messages.MessageField('NodeInitializationAction', 3, repeated=True) - masterConfig = _messages.MessageField('InstanceGroupConfig', 4) + mainConfig = _messages.MessageField('InstanceGroupConfig', 4) secondaryWorkerConfig = _messages.MessageField('InstanceGroupConfig', 5) softwareConfig = _messages.MessageField('SoftwareConfig', 6) workerConfig = _messages.MessageField('InstanceGroupConfig', 7) @@ -1065,7 +1065,7 @@ class AdditionalProperty(_messages.Message): class InstanceGroupConfig(_messages.Message): r"""Optional. The config settings for Compute Engine resources in an - instance group, such as a master or worker group. + instance group, such as a main or worker group. Fields: accelerators: Optional. The Compute Engine accelerator configuration for @@ -1091,7 +1091,7 @@ class InstanceGroupConfig(_messages.Message): Group Manager that manages this group. This is only used for preemptible instance groups. numInstances: Optional. The number of VM instances in the instance group. - For master instance groups, must be set to 1. + For main instance groups, must be set to 1. """ accelerators = _messages.MessageField('AcceleratorConfig', 1, repeated=True) @@ -2253,7 +2253,7 @@ class YarnApplication(_messages.Message): progress: Required. The numerical progress of the application, from 1 to 100. state: Required. The application state. - trackingUrl: Optional. The HTTP URL of the ApplicationMaster, + trackingUrl: Optional. The HTTP URL of the ApplicationMain, HistoryServer, or TimelineServer that provides application-specific information. The URL uses the internal hostname, and requires a proxy server for resolution and, possibly, access. diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py index 1b1663c6..9c940e80 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/dataproc/v1beta2/dataproc_v1beta2_messages.py @@ -150,16 +150,16 @@ class ClusterConfig(_messages.Message): gceClusterConfig: Required. The shared Compute Engine config settings for all instances in a cluster. initializationActions: Optional. Commands to execute on each node after - config is completed. By default, executables are run on master and all + config is completed. By default, executables are run on main and all worker nodes. You can test a node's role metadata to run an - executable on a master or worker node, as shown below using curl (you + executable on a main or worker node, as shown below using curl (you can also use wget): ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1beta2/instance/attributes/dataproc- - role) if [[ "${ROLE}" == 'Master' ]]; then ... master specific actions + role) if [[ "${ROLE}" == 'Main' ]]; then ... main specific actions ... else ... worker specific actions ... fi lifecycleConfig: Optional. The config setting for auto delete cluster schedule. - masterConfig: Optional. The Compute Engine config settings for the master + mainConfig: Optional. The Compute Engine config settings for the main instance in a cluster. secondaryWorkerConfig: Optional. The Compute Engine config settings for additional worker instances in a cluster. @@ -174,7 +174,7 @@ class ClusterConfig(_messages.Message): gceClusterConfig = _messages.MessageField('GceClusterConfig', 3) initializationActions = _messages.MessageField('NodeInitializationAction', 4, repeated=True) lifecycleConfig = _messages.MessageField('LifecycleConfig', 5) - masterConfig = _messages.MessageField('InstanceGroupConfig', 6) + mainConfig = _messages.MessageField('InstanceGroupConfig', 6) secondaryWorkerConfig = _messages.MessageField('InstanceGroupConfig', 7) softwareConfig = _messages.MessageField('SoftwareConfig', 8) workerConfig = _messages.MessageField('InstanceGroupConfig', 9) @@ -1579,7 +1579,7 @@ class AdditionalProperty(_messages.Message): class InstanceGroupConfig(_messages.Message): r"""Optional. The config settings for Compute Engine resources in an - instance group, such as a master or worker group. + instance group, such as a main or worker group. Fields: accelerators: Optional. The Compute Engine accelerator configuration for @@ -1608,7 +1608,7 @@ class InstanceGroupConfig(_messages.Message): minCpuPlatform: Optional. Specifies the minimum cpu platform for the Instance Group. See Cloud Dataproc→Minimum CPU Platform. numInstances: Optional. The number of VM instances in the instance group. - For master instance groups, must be set to 1. + For main instance groups, must be set to 1. """ accelerators = _messages.MessageField('AcceleratorConfig', 1, repeated=True) @@ -3251,7 +3251,7 @@ class YarnApplication(_messages.Message): progress: Required. The numerical progress of the application, from 1 to 100. state: Required. The application state. - trackingUrl: Optional. The HTTP URL of the ApplicationMaster, + trackingUrl: Optional. The HTTP URL of the ApplicationMain, HistoryServer, or TimelineServer that provides application-specific information. The URL uses the internal hostname, and requires a proxy server for resolution and, possibly, access. diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py index 844b52b1..c06366c7 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/genomics/v1/genomics_v1_messages.py @@ -1481,8 +1481,8 @@ class FormatValueValuesEnum(_messages.Enum): this reason, uncompressed VCF is currently recommended for imports with more than 1GB combined uncompressed size, or for time sensitive imports. - FORMAT_COMPLETE_GENOMICS: Complete Genomics masterVarBeta format. The - masterVarBeta files may be bzip2 compressed. + FORMAT_COMPLETE_GENOMICS: Complete Genomics mainVarBeta format. The + mainVarBeta files may be bzip2 compressed. """ FORMAT_UNSPECIFIED = 0 FORMAT_VCF = 1 diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py index 0b076492..b1895d69 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/ml/v1/ml_v1_messages.py @@ -930,14 +930,14 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): TensorFlow program as the '--job-dir' command-line argument. The benefit of specifying this field is that Cloud ML validates the path for use in training. - masterType: Optional. Specifies the type of virtual machine to use for - your training job's master worker. The following types are supported: + mainType: Optional. Specifies the type of virtual machine to use for + your training job's main worker. The following types are supported:
standard
A basic machine configuration suitable for training simple models with small to moderate datasets.
large_model
A machine with a lot of memory, specially suited for parameter servers when your model is large (having many hidden layers or layers with very large numbers of nodes).
-
complex_model_s
A machine suitable for the master and +
complex_model_s
A machine suitable for the main and workers of the cluster when your model requires more computation than the standard machine can handle satisfactorily.
complex_model_m
A machine with roughly twice the @@ -972,7 +972,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): also set `parameter_server_type`. parameterServerType: Optional. Specifies the type of virtual machine to use for your training job's parameter server. The supported values are - the same as those described in the entry for `master_type`. This value + the same as those described in the entry for `main_type`. This value must be present when `scaleTier` is set to `CUSTOM` and `parameter_server_count` is greater than zero. pythonModule: Required. The Python module name to run after installing the @@ -995,7 +995,7 @@ class GoogleCloudMlV1TrainingInput(_messages.Message): to `CUSTOM`. If you set this value, you must also set `worker_type`. workerType: Optional. Specifies the type of virtual machine to use for your training job's worker nodes. The supported values are the same as - those described in the entry for `masterType`. This value must be + those described in the entry for `mainType`. This value must be present when `scaleTier` is set to `CUSTOM` and `workerCount` is greater than zero. """ @@ -1017,8 +1017,8 @@ class ScaleTierValueValuesEnum(_messages.Enum): CUSTOM: The CUSTOM tier is not a set tier, but rather enables you to use your own cluster specification. When you use this tier, set values to configure your processing cluster according to these guidelines: * - You _must_ set `TrainingInput.masterType` to specify the type of - machine to use for your master node. This is the only required + You _must_ set `TrainingInput.mainType` to specify the type of + machine to use for your main node. This is the only required setting. * You _may_ set `TrainingInput.workerCount` to specify the number of workers to use. If you specify one or more workers, you _must_ also set `TrainingInput.workerType` to specify the type of @@ -1028,9 +1028,9 @@ class ScaleTierValueValuesEnum(_messages.Enum): servers, you _must_ also set `TrainingInput.parameterServerType` to specify the type of machine to use for your parameter servers. Note that all of your workers must use the same machine type, which - can be different from your parameter server type and master type. Your + can be different from your parameter server type and main type. Your parameter servers must likewise use the same machine type, which can - be different from your worker type and master type. + be different from your worker type and main type. """ BASIC = 0 STANDARD_1 = 1 @@ -1042,7 +1042,7 @@ class ScaleTierValueValuesEnum(_messages.Enum): args = _messages.StringField(1, repeated=True) hyperparameters = _messages.MessageField('GoogleCloudMlV1HyperparameterSpec', 2) jobDir = _messages.StringField(3) - masterType = _messages.StringField(4) + mainType = _messages.StringField(4) packageUris = _messages.StringField(5, repeated=True) parameterServerCount = _messages.IntegerField(6) parameterServerType = _messages.StringField(7) diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py index c7fab2a0..b6d809df 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta3/sqladmin_v1beta3_messages.py @@ -161,7 +161,7 @@ class DatabaseInstance(_messages.Message): ipAddresses: The assigned IP addresses for the instance. ipv6Address: The IPv6 address assigned to the instance. kind: This is always sql#instance. - masterInstanceName: The name of the instance which will act as master in + mainInstanceName: The name of the instance which will act as main in the replication setup. maxDiskSize: The maximum disk size of the instance in bytes. project: The project ID of the project containing the Cloud SQL instance. @@ -191,7 +191,7 @@ class DatabaseInstance(_messages.Message): ipAddresses = _messages.MessageField('IpMapping', 7, repeated=True) ipv6Address = _messages.StringField(8) kind = _messages.StringField(9, default=u'sql#instance') - masterInstanceName = _messages.StringField(10) + mainInstanceName = _messages.StringField(10) maxDiskSize = _messages.IntegerField(11) project = _messages.StringField(12) region = _messages.StringField(13) diff --git a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py index d734285a..df7f6048 100644 --- a/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py +++ b/google-cloud-sdk/lib/googlecloudsdk/third_party/apis/sqladmin/v1beta4/sqladmin_v1beta4_messages.py @@ -220,14 +220,14 @@ class DatabaseInstance(_messages.Message): secondary zone. instanceType: The instance type. This can be one of the following. CLOUD_SQL_INSTANCE: A Cloud SQL instance that is not replicating from a - master. ON_PREMISES_INSTANCE: An instance running on the customer's + main. ON_PREMISES_INSTANCE: An instance running on the customer's premises. READ_REPLICA_INSTANCE: A Cloud SQL instance configured as a read-replica. ipAddresses: The assigned IP addresses for the instance. ipv6Address: The IPv6 address assigned to the instance. This property is applicable only to First Generation instances. kind: This is always sql#instance. - masterInstanceName: The name of the instance which will act as master in + mainInstanceName: The name of the instance which will act as main in the replication setup. maxDiskSize: The maximum disk size of the instance in bytes. name: Name of the Cloud SQL instance. This does not include the project @@ -241,7 +241,7 @@ class DatabaseInstance(_messages.Message): type (First Generation or Second Generation). The region can not be changed after instance creation. replicaConfiguration: Configuration specific to read-replicas replicating - from on-premises masters. + from on-premises mains. replicaNames: The replicas of the instance. selfLink: The URI of this resource. serverCaCert: SSL configuration. @@ -266,7 +266,7 @@ class FailoverReplicaValue(_messages.Message): Fields: available: The availability status of the failover replica. A false - status indicates that the failover replica is out of sync. The master + status indicates that the failover replica is out of sync. The main can only failover to the falover replica when the status is true. name: The name of the failover replica. If specified at instance creation, a failover replica is created for the instance. The name @@ -288,7 +288,7 @@ class FailoverReplicaValue(_messages.Message): ipAddresses = _messages.MessageField('IpMapping', 9, repeated=True) ipv6Address = _messages.StringField(10) kind = _messages.StringField(11, default=u'sql#instance') - masterInstanceName = _messages.StringField(12) + mainInstanceName = _messages.StringField(12) maxDiskSize = _messages.IntegerField(13) name = _messages.StringField(14) onPremisesConfiguration = _messages.MessageField('OnPremisesConfiguration', 15) @@ -316,57 +316,57 @@ class DatabasesListResponse(_messages.Message): kind = _messages.StringField(2, default=u'sql#databasesList') -class DemoteMasterConfiguration(_messages.Message): - r"""Read-replica configuration for connecting to the on-premises master. +class DemoteMainConfiguration(_messages.Message): + r"""Read-replica configuration for connecting to the on-premises main. Fields: - kind: This is always sql#demoteMasterConfiguration. + kind: This is always sql#demoteMainConfiguration. mysqlReplicaConfiguration: MySQL specific configuration when replicating - from a MySQL on-premises master. Replication configuration information + from a MySQL on-premises main. Replication configuration information such as the username, password, certificates, and keys are not stored in the instance metadata. The configuration information is used only to set up the replication connection and is stored by MySQL in a file named - master.info in the data directory. + main.info in the data directory. """ - kind = _messages.StringField(1, default=u'sql#demoteMasterConfiguration') - mysqlReplicaConfiguration = _messages.MessageField('DemoteMasterMySqlReplicaConfiguration', 2) + kind = _messages.StringField(1, default=u'sql#demoteMainConfiguration') + mysqlReplicaConfiguration = _messages.MessageField('DemoteMainMySqlReplicaConfiguration', 2) -class DemoteMasterContext(_messages.Message): - r"""Database instance demote master context. +class DemoteMainContext(_messages.Message): + r"""Database instance demote main context. Fields: - kind: This is always sql#demoteMasterContext. - masterInstanceName: The name of the instance which will act as on-premises - master in the replication setup. + kind: This is always sql#demoteMainContext. + mainInstanceName: The name of the instance which will act as on-premises + main in the replication setup. replicaConfiguration: Configuration specific to read-replicas replicating - from the on-premises master. + from the on-premises main. verifyGtidConsistency: Verify GTID consistency for demote operation. Default value: True. Second Generation instances only. Setting this flag to false enables you to bypass GTID consistency check between on- - premises master and Cloud SQL instance during the demotion operation but + premises main and Cloud SQL instance during the demotion operation but also exposes you to the risk of future replication failures. Change the value only if you know the reason for the GTID divergence and are confident that doing so will not cause any replication issues. """ - kind = _messages.StringField(1, default=u'sql#demoteMasterContext') - masterInstanceName = _messages.StringField(2) - replicaConfiguration = _messages.MessageField('DemoteMasterConfiguration', 3) + kind = _messages.StringField(1, default=u'sql#demoteMainContext') + mainInstanceName = _messages.StringField(2) + replicaConfiguration = _messages.MessageField('DemoteMainConfiguration', 3) verifyGtidConsistency = _messages.BooleanField(4) -class DemoteMasterMySqlReplicaConfiguration(_messages.Message): +class DemoteMainMySqlReplicaConfiguration(_messages.Message): r"""Read-replica configuration specific to MySQL databases. Fields: caCertificate: PEM representation of the trusted CA's x509 certificate. - clientCertificate: PEM representation of the slave's x509 certificate. - clientKey: PEM representation of the slave's private key. The + clientCertificate: PEM representation of the subordinate's x509 certificate. + clientKey: PEM representation of the subordinate's private key. The corresponsing public key is encoded in the client's certificate. The - format of the slave's private key can be either PKCS #1 or PKCS #8. - kind: This is always sql#demoteMasterMysqlReplicaConfiguration. + format of the subordinate's private key can be either PKCS #1 or PKCS #8. + kind: This is always sql#demoteMainMysqlReplicaConfiguration. password: The password for the replication connection. username: The username for the replication connection. """ @@ -374,7 +374,7 @@ class DemoteMasterMySqlReplicaConfiguration(_messages.Message): caCertificate = _messages.StringField(1) clientCertificate = _messages.StringField(2) clientKey = _messages.StringField(3) - kind = _messages.StringField(4, default=u'sql#demoteMasterMysqlReplicaConfiguration') + kind = _messages.StringField(4, default=u'sql#demoteMainMysqlReplicaConfiguration') password = _messages.StringField(5) username = _messages.StringField(6) @@ -542,14 +542,14 @@ class InstancesCloneRequest(_messages.Message): cloneContext = _messages.MessageField('CloneContext', 1) -class InstancesDemoteMasterRequest(_messages.Message): - r"""Database demote master request. +class InstancesDemoteMainRequest(_messages.Message): + r"""Database demote main request. Fields: - demoteMasterContext: Contains details about the demoteMaster operation. + demoteMainContext: Contains details about the demoteMain operation. """ - demoteMasterContext = _messages.MessageField('DemoteMasterContext', 1) + demoteMainContext = _messages.MessageField('DemoteMainContext', 1) class InstancesExportRequest(_messages.Message): @@ -723,24 +723,24 @@ class MySqlReplicaConfiguration(_messages.Message): Fields: caCertificate: PEM representation of the trusted CA's x509 certificate. - clientCertificate: PEM representation of the slave's x509 certificate. - clientKey: PEM representation of the slave's private key. The + clientCertificate: PEM representation of the subordinate's x509 certificate. + clientKey: PEM representation of the subordinate's private key. The corresponsing public key is encoded in the client's certificate. connectRetryInterval: Seconds to wait between connect retries. MySQL's default is 60 seconds. dumpFilePath: Path to a SQL dump file in Google Cloud Storage from which - the slave instance is to be created. The URI is in the form + the subordinate instance is to be created. The URI is in the form gs://bucketName/fileName. Compressed gzip files (.gz) are also supported. Dumps should have the binlog co-ordinates from which - replication should begin. This can be accomplished by setting --master- + replication should begin. This can be accomplished by setting --main- data to 1 when using mysqldump. kind: This is always sql#mysqlReplicaConfiguration. - masterHeartbeatPeriod: Interval in milliseconds between replication + mainHeartbeatPeriod: Interval in milliseconds between replication heartbeats. password: The password for the replication connection. sslCipher: A list of permissible ciphers to use for SSL encryption. username: The username for the replication connection. - verifyServerCertificate: Whether or not to check the master's Common Name + verifyServerCertificate: Whether or not to check the main's Common Name value in the certificate that it sends during the SSL handshake. """ @@ -750,7 +750,7 @@ class MySqlReplicaConfiguration(_messages.Message): connectRetryInterval = _messages.IntegerField(4, variant=_messages.Variant.INT32) dumpFilePath = _messages.StringField(5) kind = _messages.StringField(6, default=u'sql#mysqlReplicaConfiguration') - masterHeartbeatPeriod = _messages.IntegerField(7) + mainHeartbeatPeriod = _messages.IntegerField(7) password = _messages.StringField(8) sslCipher = _messages.StringField(9) username = _messages.StringField(10) @@ -863,22 +863,22 @@ class OperationsListResponse(_messages.Message): class ReplicaConfiguration(_messages.Message): - r"""Read-replica configuration for connecting to the master. + r"""Read-replica configuration for connecting to the main. Fields: failoverTarget: Specifies if the replica is the failover target. If the field is set to true the replica will be designated as a failover - replica. In case the master instance fails, the replica instance will be - promoted as the new master instance. Only one replica can be specified + replica. In case the main instance fails, the replica instance will be + promoted as the new main instance. Only one replica can be specified as failover target, and the replica has to be in different zone with the - master instance. + main instance. kind: This is always sql#replicaConfiguration. mysqlReplicaConfiguration: MySQL specific configuration when replicating - from a MySQL on-premises master. Replication configuration information + from a MySQL on-premises main. Replication configuration information such as the username, password, certificates, and keys are not stored in the instance metadata. The configuration information is used only to set up the replication connection and is stored by MySQL in a file named - master.info in the data directory. + main.info in the data directory. """ failoverTarget = _messages.BooleanField(1) @@ -1217,18 +1217,18 @@ class SqlInstancesDeleteRequest(_messages.Message): project = _messages.StringField(2, required=True) -class SqlInstancesDemoteMasterRequest(_messages.Message): - r"""A SqlInstancesDemoteMasterRequest object. +class SqlInstancesDemoteMainRequest(_messages.Message): + r"""A SqlInstancesDemoteMainRequest object. Fields: instance: Cloud SQL instance name. - instancesDemoteMasterRequest: A InstancesDemoteMasterRequest resource to + instancesDemoteMainRequest: A InstancesDemoteMainRequest resource to be passed as the request body. project: ID of the project that contains the instance. """ instance = _messages.StringField(1, required=True) - instancesDemoteMasterRequest = _messages.MessageField('InstancesDemoteMasterRequest', 2) + instancesDemoteMainRequest = _messages.MessageField('InstancesDemoteMainRequest', 2) project = _messages.StringField(3, required=True) diff --git a/google-cloud-sdk/lib/surface/auth/application_default/login.py b/google-cloud-sdk/lib/surface/auth/application_default/login.py index 9ac3ad30..ae9e101d 100644 --- a/google-cloud-sdk/lib/surface/auth/application_default/login.py +++ b/google-cloud-sdk/lib/surface/auth/application_default/login.py @@ -48,7 +48,7 @@ class Login(base.Command): instructions at https://developers.google.com/identity/protocols/application-default-credentials#calling. - API enablement and quotas are managed by the master Application Default + API enablement and quotas are managed by the main Application Default Credentials project. In the case of errors related to the API not being enabled or quota limitations, use the `--client-id-file` flag. You can create the client-id-file at https://console.cloud.google.com/apis/credentials. diff --git a/google-cloud-sdk/lib/surface/billing/accounts/list.py b/google-cloud-sdk/lib/surface/billing/accounts/list.py index 380053be..5f09d626 100644 --- a/google-cloud-sdk/lib/surface/billing/accounts/list.py +++ b/google-cloud-sdk/lib/surface/billing/accounts/list.py @@ -45,7 +45,7 @@ def Args(parser): name.basename():label=ACCOUNT_ID, displayName:label=NAME, open, - masterBillingAccount.basename():label=MASTER_ACCOUNT_ID + mainBillingAccount.basename():label=MASTER_ACCOUNT_ID ) """) parser.display_info.AddUriFunc(List.ToSelfLink) diff --git a/google-cloud-sdk/lib/surface/compute/images/import.py b/google-cloud-sdk/lib/surface/compute/images/import.py index 20727d48..de344729 100644 --- a/google-cloud-sdk/lib/surface/compute/images/import.py +++ b/google-cloud-sdk/lib/surface/compute/images/import.py @@ -49,7 +49,7 @@ _IMPORT_FROM_IMAGE_WORKFLOW = _WORKFLOW_DIR + 'import_from_image.wf.json' _IMPORT_AND_TRANSLATE_WORKFLOW = _WORKFLOW_DIR + 'import_and_translate.wf.json' _WORKFLOWS_URL = ('https://github.com/GoogleCloudPlatform/compute-image-tools/' - 'tree/master/daisy_workflows/image_import') + 'tree/main/daisy_workflows/image_import') def _IsLocalFile(file_name): diff --git a/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py b/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py index 96229d2d..ef9812d1 100644 --- a/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py +++ b/google-cloud-sdk/lib/surface/container/binauthz/attestors/public_keys/__init__.py @@ -36,8 +36,8 @@ class PublicKeys(base.Group): ## PGP KEY STRUCTURE An important feature of PGP keys is that they are hierarchical: Every "PGP - key" is composed of a "master" key pair and zero or more "subkey" pairs - certified by the master. These key pairs are collectively known as the "PGP + key" is composed of a "main" key pair and zero or more "subkey" pairs + certified by the main. These key pairs are collectively known as the "PGP key." The "public" part of this PGP key contains the public keys of all the constituent keys as well as all associated metadata (e.g. an email address). And, as might be expected, the "private" part of the PGP key contains all @@ -46,11 +46,11 @@ class PublicKeys(base.Group): One property of subkeys is that they may be marked as "revoked" if they are compromised or otherwise need to be retired. This does not remove the subkey from the PGP key but simply adds metadata indicating this revocation. The - master key pair cannot be revoked by this same mechanism. + main key pair cannot be revoked by this same mechanism. ### COMMON KEY STRUCTURE - The most common key structure is to have the master key pair only used to + The most common key structure is to have the main key pair only used to certify subkey pairs while the subkeys are used to encrypt and sign as necessary. This allows the PGP key as a whole to act as a durable identity even if an encryption key is used improperly or a signing key is compromised. diff --git a/google-cloud-sdk/lib/surface/container/binauthz/authorities/public_keys/__init__.py b/google-cloud-sdk/lib/surface/container/binauthz/authorities/public_keys/__init__.py index db675424..ea89b4d0 100644 --- a/google-cloud-sdk/lib/surface/container/binauthz/authorities/public_keys/__init__.py +++ b/google-cloud-sdk/lib/surface/container/binauthz/authorities/public_keys/__init__.py @@ -36,8 +36,8 @@ class PublicKeys(base.Group): ## PGP KEY STRUCTURE An important feature of PGP keys is that they are hierarchical: Every "PGP - key" is composed of a "master" key pair and zero or more "subkey" pairs - certified by the master. These key pairs are collectively known as the "PGP + key" is composed of a "main" key pair and zero or more "subkey" pairs + certified by the main. These key pairs are collectively known as the "PGP key." The "public" part of this PGP key contains the public keys of all the constituent keys as well as all associated metadata (e.g. an email address). And, as might be expected, the "private" part of the PGP key contains all @@ -46,11 +46,11 @@ class PublicKeys(base.Group): One property of subkeys is that they may be marked as "revoked" if they are compromised or otherwise need to be retired. This does not remove the subkey from the PGP key but simply adds metadata indicating this revocation. The - master key pair cannot be revoked by this same mechanism. + main key pair cannot be revoked by this same mechanism. ### COMMON KEY STRUCTURE - The most common key structure is to have the master key pair only used to + The most common key structure is to have the main key pair only used to certify subkey pairs while the subkeys are used to encrypt and sign as necessary. This allows the PGP key as a whole to act as a durable identity even if an encryption key is used improperly or a signing key is compromised. diff --git a/google-cloud-sdk/lib/surface/container/clusters/create.py b/google-cloud-sdk/lib/surface/container/clusters/create.py index 7b79d6cd..8324222d 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/create.py +++ b/google-cloud-sdk/lib/surface/container/clusters/create.py @@ -191,7 +191,7 @@ def ParseCreateOptionsBase(args): flags.WarnForUnspecifiedAutorepair(args) flags.WarnForUnspecifiedIpAllocationPolicy(args) cluster_ipv4_cidr = args.cluster_ipv4_cidr - enable_master_authorized_networks = args.enable_master_authorized_networks + enable_main_authorized_networks = args.enable_main_authorized_networks return api_adapter.CreateClusterOptions( accelerators=args.accelerator, additional_zones=args.additional_zones, @@ -211,7 +211,7 @@ def ParseCreateOptionsBase(args): enable_ip_alias=args.enable_ip_alias, enable_kubernetes_alpha=args.enable_kubernetes_alpha, enable_legacy_authorization=args.enable_legacy_authorization, - enable_master_authorized_networks=enable_master_authorized_networks, + enable_main_authorized_networks=enable_main_authorized_networks, enable_network_policy=args.enable_network_policy, image_type=args.image_type, image=args.image, @@ -221,7 +221,7 @@ def ParseCreateOptionsBase(args): labels=args.labels, local_ssd_count=args.local_ssd_count, maintenance_window=args.maintenance_window, - master_authorized_networks=args.master_authorized_networks, + main_authorized_networks=args.main_authorized_networks, max_nodes=args.max_nodes, max_nodes_per_pool=args.max_nodes_per_pool, min_cpu_platform=args.min_cpu_platform, @@ -263,7 +263,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddNetworkPolicyFlags(parser) flags.AddNodeTaintsFlag(parser) @@ -375,7 +375,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddWorkloadMetadataFromNodeFlag(parser) flags.AddNetworkPolicyFlags(parser) @@ -404,7 +404,7 @@ def ParseCreateOptions(self, args): ops.allow_route_overlap = args.allow_route_overlap ops.new_scopes_behavior = True ops.private_cluster = args.private_cluster - ops.master_ipv4_cidr = args.master_ipv4_cidr + ops.main_ipv4_cidr = args.main_ipv4_cidr ops.enable_stackdriver_kubernetes = args.enable_stackdriver_kubernetes ops.enable_binauthz = args.enable_binauthz ops.enable_tpu = args.enable_tpu @@ -435,7 +435,7 @@ def Args(parser): flags.AddLabelsFlag(parser) flags.AddLocalSSDAndLocalSSDVolumeConfigsFlag(parser) flags.AddMaintenanceWindowFlag(parser) - flags.AddMasterAuthorizedNetworksFlags(parser) + flags.AddMainAuthorizedNetworksFlags(parser) flags.AddMinCpuPlatformFlag(parser) flags.AddWorkloadMetadataFromNodeFlag(parser) flags.AddNetworkPolicyFlags(parser) @@ -466,7 +466,7 @@ def ParseCreateOptions(self, args): ops.enable_pod_security_policy = args.enable_pod_security_policy ops.allow_route_overlap = args.allow_route_overlap ops.private_cluster = args.private_cluster - ops.master_ipv4_cidr = args.master_ipv4_cidr + ops.main_ipv4_cidr = args.main_ipv4_cidr ops.new_scopes_behavior = True ops.enable_tpu = args.enable_tpu ops.tpu_ipv4_cidr = args.tpu_ipv4_cidr diff --git a/google-cloud-sdk/lib/surface/container/clusters/delete.py b/google-cloud-sdk/lib/surface/container/clusters/delete.py index d7943780..3f491a7e 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/delete.py +++ b/google-cloud-sdk/lib/surface/container/clusters/delete.py @@ -33,7 +33,7 @@ class Delete(base.DeleteCommand): When you delete a cluster, the following resources are deleted: - - The master resources + - The main resources - All of the node instances in the cluster - Any Pods that are running on those instances - Any firewalls and routes created by Kubernetes Engine at the time of cluster diff --git a/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py b/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py index 25e71dd7..f0a5f151 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py +++ b/google-cloud-sdk/lib/surface/container/clusters/get_credentials.py @@ -87,7 +87,7 @@ def Run(self, args): log.status.Print('Fetching cluster endpoint and auth data.') # Call DescribeCluster to get auth info and cache for next time cluster = adapter.GetCluster(cluster_ref) - auth = cluster.masterAuth + auth = cluster.mainAuth # TODO(b/70856999) Make this consistent with the checks in # api_lib/container/kubeconfig.py. missing_creds = not (auth and auth.clientCertificate and auth.clientKey) diff --git a/google-cloud-sdk/lib/surface/container/clusters/update.py b/google-cloud-sdk/lib/surface/container/clusters/update.py index 6bc79cea..14e01767 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/update.py +++ b/google-cloud-sdk/lib/surface/container/clusters/update.py @@ -180,7 +180,7 @@ def Args(parser): _AddMutuallyExclusiveArgs(group, base.ReleaseTrack.GA) flags.AddNodeLocationsFlag(group_locations) flags.AddClusterAutoscalingFlags(parser, group) - flags.AddMasterAuthorizedNetworksFlags(parser, + flags.AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) @@ -243,32 +243,32 @@ def Run(self, args): if args.username is not None or args.enable_basic_auth is not None: flags.MungeBasicAuthFlags(args) - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.SET_USERNAME, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.SET_USERNAME, username=args.username, password=args.password) try: - op_ref = adapter.SetMasterAuth(cluster_ref, options) + op_ref = adapter.SetMainAuth(cluster_ref, options) except apitools_exceptions.HttpError as error: raise exceptions.HttpException(error, util.HTTP_ERROR_FORMAT) elif (args.generate_password or args.set_password or args.password is not None): if args.generate_password: password = '' - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.GENERATE_PASSWORD, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.GENERATE_PASSWORD, password=password) else: password = args.password if args.password is None: password = input('Please enter the new password:') - options = api_adapter.SetMasterAuthOptions( - action=api_adapter.SetMasterAuthOptions.SET_PASSWORD, + options = api_adapter.SetMainAuthOptions( + action=api_adapter.SetMainAuthOptions.SET_PASSWORD, password=password) try: - op_ref = adapter.SetMasterAuth(cluster_ref, options) + op_ref = adapter.SetMainAuth(cluster_ref, options) del password del options except apitools_exceptions.HttpError as error: @@ -292,7 +292,7 @@ def Run(self, args): elif args.start_ip_rotation or args.start_credential_rotation: if args.start_ip_rotation: msg_tmpl = """This will start an IP Rotation on cluster [{name}]. The \ -master will be updated to serve on a new IP address in addition to the current \ +main will be updated to serve on a new IP address in addition to the current \ IP address. Kubernetes Engine will then recreate all nodes ({num_nodes} nodes) \ to point to the new IP address. This operation is long-running and will block \ other operations on the cluster (including delete) until it has run to \ @@ -300,7 +300,7 @@ def Run(self, args): rotate_credentials = False elif args.start_credential_rotation: msg_tmpl = """This will start an IP and Credentials Rotation on cluster\ - [{name}]. The master will be updated to serve on a new IP address in addition \ + [{name}]. The main will be updated to serve on a new IP address in addition \ to the current IP address, and cluster credentials will be rotated. Kubernetes \ Engine will then recreate all nodes ({num_nodes} nodes) to point to the new IP \ address. This operation is long-running and will block other operations on the \ @@ -319,7 +319,7 @@ def Run(self, args): elif args.complete_ip_rotation or args.complete_credential_rotation: if args.complete_ip_rotation: msg_tmpl = """This will complete the in-progress IP Rotation on \ -cluster [{name}]. The master will be updated to stop serving on the old IP \ +cluster [{name}]. The main will be updated to stop serving on the old IP \ address and only serve on the new IP address. Make sure all API clients have \ been updated to communicate with the new IP address (e.g. by running `gcloud \ container clusters get-credentials --project {project} --zone {zone} {name}`). \ @@ -327,7 +327,7 @@ def Run(self, args): (including delete) until it has run to completion.""" elif args.complete_credential_rotation: msg_tmpl = """This will complete the in-progress Credential Rotation on\ - cluster [{name}]. The master will be updated to stop serving on the old IP \ + cluster [{name}]. The main will be updated to stop serving on the old IP \ address and only serve on the new IP address. Old cluster credentials will be \ invalidated. Make sure all API clients have been updated to communicate with \ the new IP address (e.g. by running `gcloud container clusters get-credentials \ @@ -404,7 +404,7 @@ def Args(parser): group_locations = group.add_mutually_exclusive_group() _AddAdditionalZonesArg(group_locations, deprecated=True) flags.AddNodeLocationsFlag(group_locations) - flags.AddMasterAuthorizedNetworksFlags(parser, + flags.AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) @@ -447,7 +447,7 @@ def Args(parser): group_locations = group.add_mutually_exclusive_group() _AddAdditionalZonesArg(group_locations, deprecated=True) flags.AddNodeLocationsFlag(group_locations) - flags.AddMasterAuthorizedNetworksFlags(parser, + flags.AddMainAuthorizedNetworksFlags(parser, enable_group_for_update=group) flags.AddEnableLegacyAuthorizationFlag(group) flags.AddStartIpRotationFlag(group) diff --git a/google-cloud-sdk/lib/surface/container/clusters/upgrade.py b/google-cloud-sdk/lib/surface/container/clusters/upgrade.py index 64e38f69..ecf8fcc5 100644 --- a/google-cloud-sdk/lib/surface/container/clusters/upgrade.py +++ b/google-cloud-sdk/lib/surface/container/clusters/upgrade.py @@ -51,20 +51,20 @@ class UpgradeHelpText(object): class VersionVerifier(object): - """Compares the cluster and master versions for upgrade availablity.""" + """Compares the cluster and main versions for upgrade availablity.""" UP_TO_DATE = 0 UPGRADE_AVAILABLE = 1 SUPPORT_ENDING = 2 UNSUPPORTED = 3 - def Compare(self, current_master_version, current_cluster_version): - """Compares the cluster and master versions and returns an enum.""" - # TODO(b/36051978):update the if condition when we roll the master version - if current_master_version == current_cluster_version: + def Compare(self, current_main_version, current_cluster_version): + """Compares the cluster and main versions and returns an enum.""" + # TODO(b/36051978):update the if condition when we roll the main version + if current_main_version == current_cluster_version: return self.UP_TO_DATE - master_version = SemVer(current_master_version) + main_version = SemVer(current_main_version) cluster_version = SemVer(current_cluster_version) - major, minor, _ = master_version.Distance(cluster_version) + major, minor, _ = main_version.Distance(cluster_version) if major != 0 or minor > 2: return self.UNSUPPORTED elif minor > 1: @@ -90,13 +90,13 @@ def _Args(parser): The Kubernetes release version to which to upgrade the cluster's nodes. When upgrading nodes, the minor version (*X.Y*.Z) must be no greater than the -cluster master's minor version (i.e. if the master's version is 1.2.34, the +cluster main's minor version (i.e. if the main's version is 1.2.34, the nodes cannot be upgraded to 1.3.45). For any minor version, only the latest patch version (X.Y.*Z*) is allowed (i.e. if there exists a version 1.2.34, the nodes cannot be upgraded to 1.2.33). Omit to upgrade to the same version as the -master. +main. -When upgrading master, the only valid value is the latest supported version. +When upgrading main, the only valid value is the latest supported version. Omit to have the server automatically select the latest version. You can find the list of allowed versions for upgrades by running: @@ -107,10 +107,10 @@ def _Args(parser): '--node-pool', help='The node pool to upgrade.') parser.add_argument( - '--master', - help='Upgrade the cluster\'s master to the latest version of Kubernetes' + '--main', + help='Upgrade the cluster\'s main to the latest version of Kubernetes' ' supported on Kubernetes Engine. Nodes cannot be upgraded at the same' - ' time as the master.', + ' time as the main.', action='store_true') flags.AddAsyncFlag(parser) flags.AddImageTypeFlag(parser, 'cluster/node pool') @@ -155,7 +155,7 @@ def Run(self, args): upgrade_message = container_command_util.ClusterUpgradeMessage( name=args.name, cluster=cluster, - master=args.master, + main=args.main, node_pool_name=args.node_pool, new_version=args.cluster_version, concurrent_node_count=concurrent_node_count) @@ -167,8 +167,8 @@ def Run(self, args): options = api_adapter.UpdateClusterOptions( version=args.cluster_version, - update_master=args.master, - update_nodes=(not args.master), + update_main=args.main, + update_nodes=(not args.main), node_pool=args.node_pool, image_type=args.image_type, image=args.image, @@ -190,12 +190,12 @@ def Run(self, args): 'DESCRIPTION': """\ Upgrades the Kubernetes version of an existing container cluster. - This command upgrades the Kubernetes version of the *nodes* or *master* of - a cluster. Note that the Kubernetes version of the cluster's *master* is + This command upgrades the Kubernetes version of the *nodes* or *main* of + a cluster. Note that the Kubernetes version of the cluster's *main* is also periodically upgraded automatically as new releases are available. If desired cluster version is omitted, *node* upgrades default to the - current *master* version and *master* upgrades default to the latest + current *main* version and *main* upgrades default to the latest supported version. *By running this command, all of the cluster's nodes will be deleted and* @@ -211,7 +211,7 @@ def Run(self, args): """, 'EXAMPLES': """\ Upgrade the nodes of to the Kubernetes version of the cluster's - master. + main. $ {command} @@ -219,9 +219,9 @@ def Run(self, args): $ {command} --cluster-version "x.y.z" - Upgrade the master of to the latest supported version: + Upgrade the main of to the latest supported version: - $ {command} --master" + $ {command} --main" """, } diff --git a/google-cloud-sdk/lib/surface/dataproc/clusters/create.py b/google-cloud-sdk/lib/surface/dataproc/clusters/create.py index f884c787..4d39032e 100644 --- a/google-cloud-sdk/lib/surface/dataproc/clusters/create.py +++ b/google-cloud-sdk/lib/surface/dataproc/clusters/create.py @@ -148,7 +148,7 @@ def Args(parser): kms_resource_args.AddKmsKeyResourceArg( parser, 'cluster', flag_overrides=kms_flag_overrides) - for instance_type in ('master', 'worker'): + for instance_type in ('main', 'worker'): help_msg = """\ Attaches accelerators (e.g. GPUs) to the {instance_type} instance(s). @@ -180,10 +180,10 @@ def Args(parser): @staticmethod def ValidateArgs(args): super(CreateBeta, CreateBeta).ValidateArgs(args) - if args.master_accelerator and 'type' not in args.master_accelerator: + if args.main_accelerator and 'type' not in args.main_accelerator: raise exceptions.InvalidArgumentException( - '--master-accelerator', 'accelerator type must be specified. ' - 'e.g. --master-accelerator type=nvidia-tesla-k80,count=2') + '--main-accelerator', 'accelerator type must be specified. ' + 'e.g. --main-accelerator type=nvidia-tesla-k80,count=2') if args.worker_accelerator and 'type' not in args.worker_accelerator: raise exceptions.InvalidArgumentException( '--worker-accelerator', 'accelerator type must be specified. ' diff --git a/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py b/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py index dad41229..adce236f 100644 --- a/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py +++ b/google-cloud-sdk/lib/surface/dataproc/workflow_templates/__init__.py @@ -53,7 +53,7 @@ class WorkflowTemplates(base.Group): To update managed cluster in a workflow template, run: - $ {command} set-managed-cluster my_template --num-masters 5 + $ {command} set-managed-cluster my_template --num-mains 5 To update cluster selector in a workflow template, run: diff --git a/google-cloud-sdk/lib/surface/dataproc/workflow_templates/set_managed_cluster.py b/google-cloud-sdk/lib/surface/dataproc/workflow_templates/set_managed_cluster.py index 16a23109..40f69b83 100644 --- a/google-cloud-sdk/lib/surface/dataproc/workflow_templates/set_managed_cluster.py +++ b/google-cloud-sdk/lib/surface/dataproc/workflow_templates/set_managed_cluster.py @@ -69,7 +69,7 @@ def Args(parser): information on time formats. """) - for instance_type in ('master', 'worker'): + for instance_type in ('main', 'worker'): help_msg = """\ Attaches accelerators (e.g. GPUs) to the {instance_type} instance(s). diff --git a/google-cloud-sdk/lib/surface/ml_engine/local/train.py b/google-cloud-sdk/lib/surface/ml_engine/local/train.py index c425c471..665ecd3f 100644 --- a/google-cloud-sdk/lib/surface/ml_engine/local/train.py +++ b/google-cloud-sdk/lib/surface/ml_engine/local/train.py @@ -98,7 +98,7 @@ def Run(self, args): retval = local_train.MakeProcess(args.module_name, package_root, args=user_args, - task_type='master') + task_type='main') # Don't raise an exception because the users will already see the message. # We want this to mimic calling the script directly as much as possible. self.exit_code = retval diff --git a/google-cloud-sdk/lib/surface/source/repos/clone.py b/google-cloud-sdk/lib/surface/source/repos/clone.py index 7ac73612..b3af932f 100644 --- a/google-cloud-sdk/lib/surface/source/repos/clone.py +++ b/google-cloud-sdk/lib/surface/source/repos/clone.py @@ -49,7 +49,7 @@ class CloneGA(base.Command): $ {command} REPOSITORY_NAME DIRECTORY_NAME $ cd DIRECTORY_NAME ... create/edit files and create one or more commits ... - $ git push origin master + $ git push origin main """, } @@ -133,7 +133,7 @@ class CloneAlpha(CloneGA): $ {command} REPOSITORY_NAME DIRECTORY_NAME $ cd DIRECTORY_NAME ... create/edit files and create one or more commits ... - $ git push origin master + $ git push origin main """ @staticmethod diff --git a/google-cloud-sdk/lib/surface/sql/instances/create.py b/google-cloud-sdk/lib/surface/sql/instances/create.py index b3be8058..475be440 100644 --- a/google-cloud-sdk/lib/surface/sql/instances/create.py +++ b/google-cloud-sdk/lib/surface/sql/instances/create.py @@ -85,11 +85,11 @@ def AddBaseArgs(parser): flags.AddMaintenanceWindowDay(parser) flags.AddMaintenanceWindowHour(parser) parser.add_argument( - '--master-instance-name', + '--main-instance-name', required=False, - help=('Name of the instance which will act as master in the ' + help=('Name of the instance which will act as main in the ' 'replication setup. The newly created instance will be a read ' - 'replica of the specified master instance.')) + 'replica of the specified main instance.')) flags.AddMemory(parser) parser.add_argument( '--pricing-plan', @@ -141,7 +141,7 @@ def AddBaseArgs(parser): def AddBetaArgs(parser): """Declare beta flag and positional arguments for this command parser.""" - flags.AddExternalMasterGroup(parser) + flags.AddExternalMainGroup(parser) flags.AddInstanceResizeLimit(parser) labels_util.AddCreateLabelsFlags(parser) @@ -171,36 +171,36 @@ def RunBaseCreateCommand(args, release_track): params={'project': properties.VALUES.core.project.GetOrFail}, collection='sql.instances') - # Get the region, tier, and database version from the master if these fields + # Get the region, tier, and database version from the main if these fields # are not specified. # TODO(b/64266672): Remove once API does not require these fields. - if args.IsSpecified('master_instance_name'): - master_instance_ref = client.resource_parser.Parse( - args.master_instance_name, + if args.IsSpecified('main_instance_name'): + main_instance_ref = client.resource_parser.Parse( + args.main_instance_name, params={'project': properties.VALUES.core.project.GetOrFail}, collection='sql.instances') try: - master_instance_resource = sql_client.instances.Get( + main_instance_resource = sql_client.instances.Get( sql_messages.SqlInstancesGetRequest( project=instance_ref.project, - instance=master_instance_ref.instance)) + instance=main_instance_ref.instance)) except apitools_exceptions.HttpError as error: # TODO(b/64292220): Remove once API gives helpful error message. - log.debug('operation : %s', str(master_instance_ref)) + log.debug('operation : %s', str(main_instance_ref)) exc = exceptions.HttpException(error) if resource_property.Get(exc.payload.content, resource_lex.ParseKey('error.errors[0].reason'), None) == 'notAuthorized': - msg = ('You are either not authorized to access the master instance or ' + msg = ('You are either not authorized to access the main instance or ' 'it does not exist.') raise exceptions.HttpException(msg) raise if not args.IsSpecified('region'): - args.region = master_instance_resource.region + args.region = main_instance_resource.region if not args.IsSpecified('database_version'): - args.database_version = master_instance_resource.databaseVersion - if not args.IsSpecified('tier') and master_instance_resource.settings: - args.tier = master_instance_resource.settings.tier + args.database_version = main_instance_resource.databaseVersion + if not args.IsSpecified('tier') and main_instance_resource.settings: + args.tier = main_instance_resource.settings.tier instance_resource = ( command_util.InstancesV1Beta4.ConstructCreateInstanceFromArgs( diff --git a/google-cloud-sdk/lib/surface/sql/instances/failover.py b/google-cloud-sdk/lib/surface/sql/instances/failover.py index d60f87a3..433c6d5e 100644 --- a/google-cloud-sdk/lib/surface/sql/instances/failover.py +++ b/google-cloud-sdk/lib/surface/sql/instances/failover.py @@ -66,7 +66,7 @@ def Run(self, args): console_io.PromptContinue( message='Failover will be initiated. Existing connections to the ' - 'master instance will break and no new connection can be established ' + 'main instance will break and no new connection can be established ' 'during the failover.', default=True, cancel_on_no=True) diff --git a/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py b/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py index ecb1ce01..e1739aaf 100644 --- a/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py +++ b/google-cloud-sdk/lib/third_party/apitools/base/py/batch.py @@ -176,7 +176,7 @@ def Add(self, service, method, request, global_params=None): method_config, request, global_params=global_params, upload_config=upload_config) - # Create the request and add it to our master list. + # Create the request and add it to our main list. api_request = self.ApiCall( http_request, self.retryable_codes, service, method_config) self.api_requests.append(api_request) diff --git a/google-cloud-sdk/lib/third_party/dns/rdataset.py b/google-cloud-sdk/lib/third_party/dns/rdataset.py index db266f2f..403996c0 100644 --- a/google-cloud-sdk/lib/third_party/dns/rdataset.py +++ b/google-cloud-sdk/lib/third_party/dns/rdataset.py @@ -174,7 +174,7 @@ def __ne__(self, other): def to_text(self, name=None, origin=None, relativize=True, override_rdclass=None, **kw): - """Convert the rdataset into DNS master file format. + """Convert the rdataset into DNS main file format. @see: L{dns.name.Name.choose_relativity} for more information on how I{origin} and I{relativize} determine the way names diff --git a/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py b/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py index cc0098e8..b363af51 100644 --- a/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py +++ b/google-cloud-sdk/lib/third_party/dns/rdtypes/ANY/SOA.py @@ -24,7 +24,7 @@ class SOA(dns.rdata.Rdata): """SOA record - @ivar mname: the SOA MNAME (master name) field + @ivar mname: the SOA MNAME (main name) field @type mname: dns.name.Name object @ivar rname: the SOA RNAME (responsible name) field @type rname: dns.name.Name object diff --git a/google-cloud-sdk/lib/third_party/dns/rrset.py b/google-cloud-sdk/lib/third_party/dns/rrset.py index d0f8f937..e2dbc5d1 100644 --- a/google-cloud-sdk/lib/third_party/dns/rrset.py +++ b/google-cloud-sdk/lib/third_party/dns/rrset.py @@ -88,7 +88,7 @@ def match(self, name, rdclass, rdtype, covers, deleting=None): return True def to_text(self, origin=None, relativize=True, **kw): - """Convert the RRset into DNS master file format. + """Convert the RRset into DNS main file format. @see: L{dns.name.Name.choose_relativity} for more information on how I{origin} and I{relativize} determine the way names diff --git a/google-cloud-sdk/lib/third_party/dns/tokenizer.py b/google-cloud-sdk/lib/third_party/dns/tokenizer.py index 04b98254..966111ea 100644 --- a/google-cloud-sdk/lib/third_party/dns/tokenizer.py +++ b/google-cloud-sdk/lib/third_party/dns/tokenizer.py @@ -13,7 +13,7 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT # OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -"""Tokenize DNS master file format""" +"""Tokenize DNS main file format""" from io import StringIO import sys @@ -50,7 +50,7 @@ class UngetBufferFull(dns.exception.DNSException): class Token(object): - """A DNS master file format token. + """A DNS main file format token. @ivar ttype: The token type @type ttype: int @@ -161,7 +161,7 @@ def __getitem__(self, i): class Tokenizer(object): - """A DNS master file format tokenizer. + """A DNS main file format tokenizer. A token is a (type, value) tuple, where I{type} is an int, and I{value} is a string. The valid types are EOF, EOL, WHITESPACE, diff --git a/google-cloud-sdk/lib/third_party/dns/zone.py b/google-cloud-sdk/lib/third_party/dns/zone.py index 468618f6..dee22797 100644 --- a/google-cloud-sdk/lib/third_party/dns/zone.py +++ b/google-cloud-sdk/lib/third_party/dns/zone.py @@ -583,9 +583,9 @@ def check_origin(self): raise NoNS -class _MasterReader(object): +class _MainReader(object): - """Read a DNS master file + """Read a DNS main file @ivar tok: The tokenizer @type tok: dns.tokenizer.Tokenizer object @@ -633,7 +633,7 @@ def _eat_line(self): break def _rr_line(self): - """Process one line from a DNS master file.""" + """Process one line from a DNS main file.""" # Name if self.current_origin is None: raise UnknownOrigin @@ -752,7 +752,7 @@ def _parse_modify(self, side): def _generate_line(self): # range lhs [ttl] [class] type rhs [ comment ] """Process one line containing the GENERATE statement from a DNS - master file.""" + main file.""" if self.current_origin is None: raise UnknownOrigin @@ -867,7 +867,7 @@ def _generate_line(self): rds.add(rd, ttl) def read(self): - """Read a DNS master file and build a zone object. + """Read a DNS main file and build a zone object. @raises dns.zone.NoSOA: No SOA RR was found at the zone origin @raises dns.zone.NoNS: No NS RRset was found at the zone origin @@ -932,7 +932,7 @@ def read(self): self._generate_line() else: raise dns.exception.SyntaxError( - "Unknown master file directive '" + c + "'") + "Unknown main file directive '" + c + "'") continue self.tok.unget(token) self._rr_line() @@ -951,12 +951,12 @@ def read(self): def from_text(text, origin=None, rdclass=dns.rdataclass.IN, relativize=True, zone_factory=Zone, filename=None, allow_include=False, check_origin=True): - """Build a zone object from a master file format string. + """Build a zone object from a main file format string. - @param text: the master file format input + @param text: the main file format input @type text: string. @param origin: The origin of the zone; if not specified, the first - $ORIGIN statement in the master file will determine the origin of the + $ORIGIN statement in the main file will determine the origin of the zone. @type origin: dns.name.Name object or string @param rdclass: The zone's rdata class; the default is class IN. @@ -985,7 +985,7 @@ def from_text(text, origin=None, rdclass=dns.rdataclass.IN, if filename is None: filename = '' tok = dns.tokenizer.Tokenizer(text, filename) - reader = _MasterReader(tok, origin, rdclass, relativize, zone_factory, + reader = _MainReader(tok, origin, rdclass, relativize, zone_factory, allow_include=allow_include, check_origin=check_origin) reader.read() @@ -995,12 +995,12 @@ def from_text(text, origin=None, rdclass=dns.rdataclass.IN, def from_file(f, origin=None, rdclass=dns.rdataclass.IN, relativize=True, zone_factory=Zone, filename=None, allow_include=True, check_origin=True): - """Read a master file and build a zone object. + """Read a main file and build a zone object. @param f: file or string. If I{f} is a string, it is treated as the name of a file to open. @param origin: The origin of the zone; if not specified, the first - $ORIGIN statement in the master file will determine the origin of the + $ORIGIN statement in the main file will determine the origin of the zone. @type origin: dns.name.Name object or string @param rdclass: The zone's rdata class; the default is class IN. diff --git a/google-cloud-sdk/lib/third_party/dulwich/repo.py b/google-cloud-sdk/lib/third_party/dulwich/repo.py index d4f252bd..03b0609e 100644 --- a/google-cloud-sdk/lib/third_party/dulwich/repo.py +++ b/google-cloud-sdk/lib/third_party/dulwich/repo.py @@ -790,8 +790,8 @@ def clone(self, target_path, mkdir=True, bare=False, b'refs/tags', self.refs.as_dict(b'refs/tags')) try: target.refs.add_if_new( - b'refs/heads/master', - self.refs[b'refs/heads/master']) + b'refs/heads/main', + self.refs[b'refs/heads/main']) except KeyError: pass @@ -876,7 +876,7 @@ def _init_maybe_bare(cls, path, bare): os.mkdir(os.path.join(path, *d)) DiskObjectStore.init(os.path.join(path, OBJECTDIR)) ret = cls(path) - ret.refs.set_symbolic_ref(b'HEAD', b"refs/heads/master") + ret.refs.set_symbolic_ref(b'HEAD', b"refs/heads/main") ret._init_files(bare) return ret diff --git a/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py b/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py index aa284b2f..8a2d3eeb 100644 --- a/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py +++ b/google-cloud-sdk/lib/third_party/ml_sdk/cloud/ml/io/coders.py @@ -380,7 +380,7 @@ def __init__(self, scale_tier=None, hyperparameters=None, region=None, - master_type=None, + main_type=None, worker_type=None, ps_type=None, worker_count=None, @@ -405,7 +405,7 @@ def __init__(self, scale_tier: Google Cloud ML tier to run in. hyperparameters: (Optional) Hyperparameter config to use for the job. region: (Optional) Google Cloud region in which to run. - master_type: Master type to use with a CUSTOM scale tier. + main_type: Main type to use with a CUSTOM scale tier. worker_type: Worker type to use with a CUSTOM scale tier. ps_type: Parameter Server type to use with a CUSTOM scale tier. worker_count: Worker count to use with a CUSTOM scale tier. @@ -422,7 +422,7 @@ def __init__(self, self.scale_tier = scale_tier self.hyperparameters = hyperparameters self.region = region - self.master_type = master_type + self.main_type = main_type self.worker_type = worker_type self.ps_type = ps_type self.worker_count = worker_count @@ -446,7 +446,7 @@ def copy(self): def __eq__(self, o): for f in ['parent', 'job_name', 'job_args', 'package_uris', 'python_module', 'timeout', 'polling_interval', 'endpoint', 'hyperparameters', - 'scale_tier', 'worker_type', 'ps_type', 'master_type', 'region', + 'scale_tier', 'worker_type', 'ps_type', 'main_type', 'region', 'ps_count', 'worker_count', 'runtime_version']: if getattr(self, f) != getattr(o, f): return False diff --git a/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py b/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py index e33de0e7..a389aa29 100644 --- a/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py +++ b/google-cloud-sdk/lib/third_party/pkg_resources/__init__.py @@ -638,9 +638,9 @@ def __init__(self, entries=None): self.add_entry(entry) @classmethod - def _build_master(cls): + def _build_main(cls): """ - Prepare the master working set. + Prepare the main working set. """ ws = cls() try: @@ -3028,9 +3028,9 @@ def _initialize(g=globals()): @_call_aside -def _initialize_master_working_set(): +def _initialize_main_working_set(): """ - Prepare the master working set and make the ``require()`` + Prepare the main working set and make the ``require()`` API available. This function has explicit effects on the global state @@ -3040,7 +3040,7 @@ def _initialize_master_working_set(): Invocation by other packages is unsupported and done at their own risk. """ - working_set = WorkingSet._build_master() + working_set = WorkingSet._build_main() _declare_state('object', working_set=working_set) require = working_set.require diff --git a/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py b/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py index 7bb3e71c..08f703d6 100644 --- a/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py +++ b/google-cloud-sdk/lib/third_party/pygments/formatters/_mapping.py @@ -68,7 +68,7 @@ content = fp.read() # replace crnl to nl for Windows. # - # Note that, originally, contributers should keep nl of master + # Note that, originally, contributers should keep nl of main # repository, for example by using some kind of automatic # management EOL, like `EolExtension # `. diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py b/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py index d950cbe8..5bf0df72 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/_lasso_builtins.py @@ -1325,7 +1325,7 @@ 'mongo_query_none', 'mongo_query_oplog_replay', 'mongo_query_partial', - 'mongo_query_slave_ok', + 'mongo_query_subordinate_ok', 'mongo_query_tailable_cursor', 'mongo_remove_none', 'mongo_remove_single_remove', @@ -1534,7 +1534,7 @@ 'sys_listunboundmethods', 'sys_loadlibrary', 'sys_lrand48', - 'sys_masterhomepath', + 'sys_mainhomepath', 'sys_mrand48', 'sys_nrand48', 'sys_pid_exec', diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py b/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py index ea54241c..de7de2c7 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/_mapping.py @@ -483,7 +483,7 @@ content = fp.read() # replace crnl to nl for Windows. # - # Note that, originally, contributers should keep nl of master + # Note that, originally, contributers should keep nl of main # repository, for example by using some kind of automatic # management EOL, like `EolExtension # `. diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py b/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py index fec3286a..dd484e44 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/_php_builtins.py @@ -59,20 +59,20 @@ 'mysqli_client_encoding', 'mysqli_connect', 'mysqli_disable_rpl_parse', - 'mysqli_enable_reads_from_master', + 'mysqli_enable_reads_from_main', 'mysqli_enable_rpl_parse', 'mysqli_escape_string', 'mysqli_execute', 'mysqli_fetch', 'mysqli_get_cache_stats', 'mysqli_get_metadata', - 'mysqli_master_query', + 'mysqli_main_query', 'mysqli_param_count', 'mysqli_report', 'mysqli_rpl_parse_enabled', 'mysqli_rpl_probe', 'mysqli_send_long_data', - 'mysqli_slave_query'), + 'mysqli_subordinate_query'), 'Apache': ('apache_child_terminate', 'apache_get_modules', 'apache_get_version', @@ -1950,11 +1950,11 @@ 'maxdb_connect', 'maxdb_data_seek', 'maxdb_debug', - 'maxdb_disable_reads_from_master', + 'maxdb_disable_reads_from_main', 'maxdb_disable_rpl_parse', 'maxdb_dump_debug_info', 'maxdb_embedded_connect', - 'maxdb_enable_reads_from_master', + 'maxdb_enable_reads_from_main', 'maxdb_enable_rpl_parse', 'maxdb_errno', 'maxdb_error', @@ -1984,7 +1984,7 @@ 'maxdb_init', 'maxdb_insert_id', 'maxdb_kill', - 'maxdb_master_query', + 'maxdb_main_query', 'maxdb_more_results', 'maxdb_multi_query', 'maxdb_next_result', @@ -4371,7 +4371,7 @@ 'yp_errno', 'yp_first', 'yp_get_default_domain', - 'yp_master', + 'yp_main', 'yp_match', 'yp_next', 'yp_order'), diff --git a/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py b/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py index 793c28be..97dec67e 100644 --- a/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py +++ b/google-cloud-sdk/lib/third_party/pygments/lexers/esoteric.py @@ -186,7 +186,7 @@ class CapDLLexer(RegexLexer): (words(('asid', 'addr', 'badge', 'cached', 'dom', 'domainID', 'elf', 'fault_ep', 'G', 'guard', 'guard_size', 'init', 'ip', 'prio', 'sp', 'R', 'RG', 'RX', 'RW', 'RWG', 'RWX', 'W', - 'WG', 'WX', 'level', 'masked', 'master_reply', 'paddr', + 'WG', 'WX', 'level', 'masked', 'main_reply', 'paddr', 'ports', 'reply', 'uncached'), suffix=r'\b'), Keyword.Reserved), diff --git a/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py b/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py index d3eabfc3..4d562940 100644 --- a/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py +++ b/google-cloud-sdk/lib/third_party/setuptools/command/easy_install.py @@ -1733,7 +1733,7 @@ def update_dist_caches(dist_path, fix_zipimporter_caches): # There are several other known sources of stale zipimport.zipimporter # instances that we do not clear here, but might if ever given a reason to # do so: - # * Global setuptools pkg_resources.working_set (a.k.a. 'master working + # * Global setuptools pkg_resources.working_set (a.k.a. 'main working # set') may contain distributions which may in turn contain their # zipimport.zipimporter loaders. # * Several zipimport.zipimporter loaders held by local variables further diff --git a/google-cloud-sdk/platform/google_appengine/google/appengine/_internal/django/conf/global_settings.py b/google-cloud-sdk/platform/google_appengine/google/appengine/_internal/django/conf/global_settings.py index ec3f1dde..69b1c69a 100644 --- a/google-cloud-sdk/platform/google_appengine/google/appengine/_internal/django/conf/global_settings.py +++ b/google-cloud-sdk/platform/google_appengine/google/appengine/_internal/django/conf/global_settings.py @@ -208,7 +208,7 @@ # Default e-mail address to use for various automated correspondence from # the site managers. -DEFAULT_FROM_EMAIL = 'webmaster@localhost' +DEFAULT_FROM_EMAIL = 'webmain@localhost' # Subject-line prefix for email messages send with django.core.mail.mail_admins # or ...mail_managers. Make sure to include the trailing space. diff --git a/google-cloud-sdk/platform/google_appengine/google/appengine/datastore/datastore_sqlite_stub.py b/google-cloud-sdk/platform/google_appengine/google/appengine/datastore/datastore_sqlite_stub.py index c13ae8b2..2e632924 100644 --- a/google-cloud-sdk/platform/google_appengine/google/appengine/datastore/datastore_sqlite_stub.py +++ b/google-cloud-sdk/platform/google_appengine/google/appengine/datastore/datastore_sqlite_stub.py @@ -687,7 +687,7 @@ def Clear(self): datastore_stub_util.BaseDatastore.Clear(self) datastore_stub_util.DatastoreStub.Clear(self) c = conn.execute( - "SELECT tbl_name FROM sqlite_master WHERE type = 'table'") + "SELECT tbl_name FROM sqlite_main WHERE type = 'table'") for row in c.fetchall(): conn.execute('DROP TABLE "%s"' % row) finally: diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/dist/build.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/dist/build.go index 39a88cca..0556fb0a 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/dist/build.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/dist/build.go @@ -237,7 +237,7 @@ func chomp(s string) string { } func branchtag(branch string) (tag string, precise bool) { - b := run(goroot, CheckExit, "git", "log", "--decorate=full", "--format=format:%d", "master.."+branch) + b := run(goroot, CheckExit, "git", "log", "--decorate=full", "--format=format:%d", "main.."+branch) tag = branch for _, line := range splitlines(b) { // Each line is either blank, or looks like @@ -304,7 +304,7 @@ func findgoversion() string { precise := false // If we're on a release branch, use the closest matching tag - // that is on the release branch (and not on the master branch). + // that is on the release branch (and not on the main branch). if strings.HasPrefix(branch, "release-branch.") { tag, precise = branchtag(branch) } diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/go_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/go_test.go index acf4a39f..2e6b485c 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/go_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/go_test.go @@ -1210,7 +1210,7 @@ func TestGetGitDefaultBranch(t *testing.T) { tg.tempDir("src") tg.setenv("GOPATH", tg.path(".")) - // This repo has two branches, master and another-branch. + // This repo has two branches, main and another-branch. // The another-branch is the default that you get from 'git clone'. // The go get command variants should not override this. const importPath = "github.com/rsc/go-get-default-branch" diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/vcs.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/vcs.go index 342edee5..6f84fa23 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/vcs.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/cmd/go/vcs.go @@ -135,9 +135,9 @@ var vcsGit = &vcsCmd{ }, tagSyncCmd: []string{"checkout {tag}", "submodule update --init --recursive"}, // both createCmd and downloadCmd update the working dir. - // No need to do more here. We used to 'checkout master' - // but that doesn't work if the default branch is not named master. - // DO NOT add 'checkout master' here. + // No need to do more here. We used to 'checkout main' + // but that doesn't work if the default branch is not named main. + // DO NOT add 'checkout main' here. // See golang.org/issue/9032. tagSyncDefault: []string{"submodule update --init --recursive"}, diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/common.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/common.go index c68ebfe1..2268c6e0 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/common.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/common.go @@ -171,7 +171,7 @@ type ConnectionState struct { // 5929, section 3). For resumed sessions this value will be nil // because resumption does not include enough context (see // https://secure-resumption.com/#channelbindings). This will change in - // future versions of Go once the TLS master-secret fix has been + // future versions of Go once the TLS main-secret fix has been // standardized and implemented. TLSUnique []byte } @@ -194,7 +194,7 @@ type ClientSessionState struct { sessionTicket []uint8 // Encrypted ticket used for session resumption with server vers uint16 // SSL/TLS version negotiated for the session cipherSuite uint16 // Ciphersuite negotiated for the session - masterSecret []byte // MasterSecret generated by client on a full handshake + mainSecret []byte // MainSecret generated by client on a full handshake serverCertificates []*x509.Certificate // Certificate chain presented by the server verifiedChains [][]*x509.Certificate // Certificate chains we built for verification } diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_client.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_client.go index 3c996acf..6f656da4 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_client.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_client.go @@ -24,7 +24,7 @@ type clientHandshakeState struct { hello *clientHelloMsg suite *cipherSuite finishedHash finishedHash - masterSecret []byte + mainSecret []byte session *ClientSessionState } @@ -428,7 +428,7 @@ func (hs *clientHandshakeState) doFullHandshake() error { c.writeRecord(recordTypeHandshake, certMsg.marshal()) } - preMasterSecret, ckx, err := keyAgreement.generateClientKeyExchange(c.config, hs.hello, certs[0]) + preMainSecret, ckx, err := keyAgreement.generateClientKeyExchange(c.config, hs.hello, certs[0]) if err != nil { c.sendAlert(alertInternalError) return err @@ -465,7 +465,7 @@ func (hs *clientHandshakeState) doFullHandshake() error { c.sendAlert(alertInternalError) return err } - digest, hashFunc, err := hs.finishedHash.hashForClientCertificate(certVerify.signatureAndHash, hs.masterSecret) + digest, hashFunc, err := hs.finishedHash.hashForClientCertificate(certVerify.signatureAndHash, hs.mainSecret) if err != nil { c.sendAlert(alertInternalError) return err @@ -480,7 +480,7 @@ func (hs *clientHandshakeState) doFullHandshake() error { c.writeRecord(recordTypeHandshake, certVerify.marshal()) } - hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret, hs.hello.random, hs.serverHello.random) + hs.mainSecret = mainFromPreMainSecret(c.vers, hs.suite, preMainSecret, hs.hello.random, hs.serverHello.random) hs.finishedHash.discardHandshakeBuffer() @@ -491,7 +491,7 @@ func (hs *clientHandshakeState) establishKeys() error { c := hs.c clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := - keysFromMasterSecret(c.vers, hs.suite, hs.masterSecret, hs.hello.random, hs.serverHello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) + keysFromMainSecret(c.vers, hs.suite, hs.mainSecret, hs.hello.random, hs.serverHello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) var clientCipher, serverCipher interface{} var clientHash, serverHash macFunction if hs.suite.cipher != nil { @@ -551,8 +551,8 @@ func (hs *clientHandshakeState) processServerHello() (bool, error) { c.scts = hs.serverHello.scts if hs.serverResumedSession() { - // Restore masterSecret and peerCerts from previous state - hs.masterSecret = hs.session.masterSecret + // Restore mainSecret and peerCerts from previous state + hs.mainSecret = hs.session.mainSecret c.peerCertificates = hs.session.serverCertificates c.verifiedChains = hs.session.verifiedChains return true, nil @@ -578,7 +578,7 @@ func (hs *clientHandshakeState) readFinished(out []byte) error { return unexpectedMessageError(serverFinished, msg) } - verify := hs.finishedHash.serverSum(hs.masterSecret) + verify := hs.finishedHash.serverSum(hs.mainSecret) if len(verify) != len(serverFinished.verifyData) || subtle.ConstantTimeCompare(verify, serverFinished.verifyData) != 1 { c.sendAlert(alertHandshakeFailure) @@ -610,7 +610,7 @@ func (hs *clientHandshakeState) readSessionTicket() error { sessionTicket: sessionTicketMsg.ticket, vers: c.vers, cipherSuite: hs.suite.id, - masterSecret: hs.masterSecret, + mainSecret: hs.mainSecret, serverCertificates: c.peerCertificates, verifiedChains: c.verifiedChains, } @@ -634,7 +634,7 @@ func (hs *clientHandshakeState) sendFinished(out []byte) error { } finished := new(finishedMsg) - finished.verifyData = hs.finishedHash.clientSum(hs.masterSecret) + finished.verifyData = hs.finishedHash.clientSum(hs.mainSecret) hs.finishedHash.Write(finished.marshal()) c.writeRecord(recordTypeHandshake, finished.marshal()) copy(out, finished.verifyData) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_messages_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_messages_test.go index 95d825bd..784efa06 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_messages_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_messages_test.go @@ -252,7 +252,7 @@ func (*sessionState) Generate(rand *rand.Rand, size int) reflect.Value { s := &sessionState{} s.vers = uint16(rand.Intn(10000)) s.cipherSuite = uint16(rand.Intn(10000)) - s.masterSecret = randomBytes(rand.Intn(100), rand) + s.mainSecret = randomBytes(rand.Intn(100), rand) numCerts := rand.Intn(20) s.certificates = make([][]byte, numCerts) for i := 0; i < numCerts; i++ { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_server.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_server.go index e16cddcb..a800cb74 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_server.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/handshake_server.go @@ -29,7 +29,7 @@ type serverHandshakeState struct { rsaSignOk bool sessionState *sessionState finishedHash finishedHash - masterSecret []byte + mainSecret []byte certsFromClient [][]byte cert *Certificate } @@ -330,7 +330,7 @@ func (hs *serverHandshakeState) doResumeHandshake() error { } } - hs.masterSecret = hs.sessionState.masterSecret + hs.mainSecret = hs.sessionState.mainSecret return nil } @@ -453,12 +453,12 @@ func (hs *serverHandshakeState) doFullHandshake() error { } hs.finishedHash.Write(ckx.marshal()) - preMasterSecret, err := keyAgreement.processClientKeyExchange(config, hs.cert, ckx, c.vers) + preMainSecret, err := keyAgreement.processClientKeyExchange(config, hs.cert, ckx, c.vers) if err != nil { c.sendAlert(alertHandshakeFailure) return err } - hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret, hs.clientHello.random, hs.hello.random) + hs.mainSecret = mainFromPreMainSecret(c.vers, hs.suite, preMainSecret, hs.clientHello.random, hs.hello.random) // If we received a client cert in response to our certificate request message, // the client will send us a certificateVerifyMsg immediately after the @@ -511,7 +511,7 @@ func (hs *serverHandshakeState) doFullHandshake() error { break } var digest []byte - if digest, _, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.masterSecret); err != nil { + if digest, _, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.mainSecret); err != nil { break } if !ecdsa.Verify(key, digest, ecdsaSig.R, ecdsaSig.S) { @@ -524,7 +524,7 @@ func (hs *serverHandshakeState) doFullHandshake() error { } var digest []byte var hashFunc crypto.Hash - if digest, hashFunc, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.masterSecret); err != nil { + if digest, hashFunc, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.mainSecret); err != nil { break } err = rsa.VerifyPKCS1v15(key, hashFunc, digest, certVerify.signature) @@ -546,7 +546,7 @@ func (hs *serverHandshakeState) establishKeys() error { c := hs.c clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := - keysFromMasterSecret(c.vers, hs.suite, hs.masterSecret, hs.clientHello.random, hs.hello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) + keysFromMainSecret(c.vers, hs.suite, hs.mainSecret, hs.clientHello.random, hs.hello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) var clientCipher, serverCipher interface{} var clientHash, serverHash macFunction @@ -599,7 +599,7 @@ func (hs *serverHandshakeState) readFinished(out []byte) error { return unexpectedMessageError(clientFinished, msg) } - verify := hs.finishedHash.clientSum(hs.masterSecret) + verify := hs.finishedHash.clientSum(hs.mainSecret) if len(verify) != len(clientFinished.verifyData) || subtle.ConstantTimeCompare(verify, clientFinished.verifyData) != 1 { c.sendAlert(alertHandshakeFailure) @@ -623,7 +623,7 @@ func (hs *serverHandshakeState) sendSessionTicket() error { state := sessionState{ vers: c.vers, cipherSuite: hs.suite.id, - masterSecret: hs.masterSecret, + mainSecret: hs.mainSecret, certificates: hs.certsFromClient, } m.ticket, err = c.encryptTicket(&state) @@ -643,7 +643,7 @@ func (hs *serverHandshakeState) sendFinished(out []byte) error { c.writeRecord(recordTypeChangeCipherSpec, []byte{1}) finished := new(finishedMsg) - finished.verifyData = hs.finishedHash.serverSum(hs.masterSecret) + finished.verifyData = hs.finishedHash.serverSum(hs.mainSecret) hs.finishedHash.Write(finished.marshal()) c.writeRecord(recordTypeHandshake, finished.marshal()) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/key_agreement.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/key_agreement.go index 0e6a7c22..9c0cdd39 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/key_agreement.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/key_agreement.go @@ -22,7 +22,7 @@ var errClientKeyExchange = errors.New("tls: invalid ClientKeyExchange message") var errServerKeyExchange = errors.New("tls: invalid ServerKeyExchange message") // rsaKeyAgreement implements the standard TLS key agreement where the client -// encrypts the pre-master secret to the server's public key. +// encrypts the pre-main secret to the server's public key. type rsaKeyAgreement struct{} func (ka rsaKeyAgreement) generateServerKeyExchange(config *Config, cert *Certificate, clientHello *clientHelloMsg, hello *serverHelloMsg) (*serverKeyExchangeMsg, error) { @@ -47,17 +47,17 @@ func (ka rsaKeyAgreement) processClientKeyExchange(config *Config, cert *Certifi return nil, errors.New("tls: certificate private key does not implement crypto.Decrypter") } // Perform constant time RSA PKCS#1 v1.5 decryption - preMasterSecret, err := priv.Decrypt(config.rand(), ciphertext, &rsa.PKCS1v15DecryptOptions{SessionKeyLen: 48}) + preMainSecret, err := priv.Decrypt(config.rand(), ciphertext, &rsa.PKCS1v15DecryptOptions{SessionKeyLen: 48}) if err != nil { return nil, err } - // We don't check the version number in the premaster secret. For one, + // We don't check the version number in the premain secret. For one, // by checking it, we would leak information about the validity of the - // encrypted pre-master secret. Secondly, it provides only a small + // encrypted pre-main secret. Secondly, it provides only a small // benefit against a downgrade attack and some implementations send the // wrong version anyway. See the discussion at the end of section // 7.4.7.1 of RFC 4346. - return preMasterSecret, nil + return preMainSecret, nil } func (ka rsaKeyAgreement) processServerKeyExchange(config *Config, clientHello *clientHelloMsg, serverHello *serverHelloMsg, cert *x509.Certificate, skx *serverKeyExchangeMsg) error { @@ -65,15 +65,15 @@ func (ka rsaKeyAgreement) processServerKeyExchange(config *Config, clientHello * } func (ka rsaKeyAgreement) generateClientKeyExchange(config *Config, clientHello *clientHelloMsg, cert *x509.Certificate) ([]byte, *clientKeyExchangeMsg, error) { - preMasterSecret := make([]byte, 48) - preMasterSecret[0] = byte(clientHello.vers >> 8) - preMasterSecret[1] = byte(clientHello.vers) - _, err := io.ReadFull(config.rand(), preMasterSecret[2:]) + preMainSecret := make([]byte, 48) + preMainSecret[0] = byte(clientHello.vers >> 8) + preMainSecret[1] = byte(clientHello.vers) + _, err := io.ReadFull(config.rand(), preMainSecret[2:]) if err != nil { return nil, nil, err } - encrypted, err := rsa.EncryptPKCS1v15(config.rand(), cert.PublicKey.(*rsa.PublicKey), preMasterSecret) + encrypted, err := rsa.EncryptPKCS1v15(config.rand(), cert.PublicKey.(*rsa.PublicKey), preMainSecret) if err != nil { return nil, nil, err } @@ -82,7 +82,7 @@ func (ka rsaKeyAgreement) generateClientKeyExchange(config *Config, clientHello ckx.ciphertext[0] = byte(len(encrypted) >> 8) ckx.ciphertext[1] = byte(len(encrypted)) copy(ckx.ciphertext[2:], encrypted) - return preMasterSecret, ckx, nil + return preMainSecret, ckx, nil } // sha1Hash calculates a SHA1 hash over the given byte slices. @@ -171,7 +171,7 @@ func curveForCurveID(id CurveID) (elliptic.Curve, bool) { // ecdheRSAKeyAgreement implements a TLS key agreement where the server // generates a ephemeral EC public/private key pair and signs it. The -// pre-master secret is then calculated using ECDH. The signature may +// pre-main secret is then calculated using ECDH. The signature may // either be ECDSA or RSA. type ecdheKeyAgreement struct { version uint16 @@ -289,11 +289,11 @@ func (ka *ecdheKeyAgreement) processClientKeyExchange(config *Config, cert *Cert return nil, errClientKeyExchange } x, _ = ka.curve.ScalarMult(x, y, ka.privateKey) - preMasterSecret := make([]byte, (ka.curve.Params().BitSize+7)>>3) + preMainSecret := make([]byte, (ka.curve.Params().BitSize+7)>>3) xBytes := x.Bytes() - copy(preMasterSecret[len(preMasterSecret)-len(xBytes):], xBytes) + copy(preMainSecret[len(preMainSecret)-len(xBytes):], xBytes) - return preMasterSecret, nil + return preMainSecret, nil } func (ka *ecdheKeyAgreement) processServerKeyExchange(config *Config, clientHello *clientHelloMsg, serverHello *serverHelloMsg, cert *x509.Certificate, skx *serverKeyExchangeMsg) error { @@ -390,9 +390,9 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel return nil, nil, err } x, _ := ka.curve.ScalarMult(ka.x, ka.y, priv) - preMasterSecret := make([]byte, (ka.curve.Params().BitSize+7)>>3) + preMainSecret := make([]byte, (ka.curve.Params().BitSize+7)>>3) xBytes := x.Bytes() - copy(preMasterSecret[len(preMasterSecret)-len(xBytes):], xBytes) + copy(preMainSecret[len(preMainSecret)-len(xBytes):], xBytes) serialized := elliptic.Marshal(ka.curve, mx, my) @@ -401,5 +401,5 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel ckx.ciphertext[0] = byte(len(serialized)) copy(ckx.ciphertext[1:], serialized) - return preMasterSecret, ckx, nil + return preMainSecret, ckx, nil } diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf.go index 747b817b..f8463b68 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf.go @@ -15,8 +15,8 @@ import ( "hash" ) -// Split a premaster secret in two as specified in RFC 4346, section 5. -func splitPreMasterSecret(secret []byte) (s1, s2 []byte) { +// Split a premain secret in two as specified in RFC 4346, section 5. +func splitPreMainSecret(secret []byte) (s1, s2 []byte) { s1 = secret[0 : (len(secret)+1)/2] s2 = secret[len(secret)/2:] return @@ -56,7 +56,7 @@ func prf10(result, secret, label, seed []byte) { copy(labelAndSeed, label) copy(labelAndSeed[len(label):], seed) - s1, s2 := splitPreMasterSecret(secret) + s1, s2 := splitPreMainSecret(secret) pHash(result, s1, labelAndSeed, hashMD5) result2 := make([]byte, len(result)) pHash(result2, s2, labelAndSeed, hashSHA1) @@ -112,11 +112,11 @@ func prf30(result, secret, label, seed []byte) { const ( tlsRandomLength = 32 // Length of a random nonce in TLS 1.1. - masterSecretLength = 48 // Length of a master secret in TLS 1.1. + mainSecretLength = 48 // Length of a main secret in TLS 1.1. finishedVerifyLength = 12 // Length of verify_data in a Finished message. ) -var masterSecretLabel = []byte("master secret") +var mainSecretLabel = []byte("main secret") var keyExpansionLabel = []byte("key expansion") var clientFinishedLabel = []byte("client finished") var serverFinishedLabel = []byte("server finished") @@ -142,29 +142,29 @@ func prfForVersion(version uint16, suite *cipherSuite) func(result, secret, labe return prf } -// masterFromPreMasterSecret generates the master secret from the pre-master +// mainFromPreMainSecret generates the main secret from the pre-main // secret. See http://tools.ietf.org/html/rfc5246#section-8.1 -func masterFromPreMasterSecret(version uint16, suite *cipherSuite, preMasterSecret, clientRandom, serverRandom []byte) []byte { +func mainFromPreMainSecret(version uint16, suite *cipherSuite, preMainSecret, clientRandom, serverRandom []byte) []byte { seed := make([]byte, 0, len(clientRandom)+len(serverRandom)) seed = append(seed, clientRandom...) seed = append(seed, serverRandom...) - masterSecret := make([]byte, masterSecretLength) - prfForVersion(version, suite)(masterSecret, preMasterSecret, masterSecretLabel, seed) - return masterSecret + mainSecret := make([]byte, mainSecretLength) + prfForVersion(version, suite)(mainSecret, preMainSecret, mainSecretLabel, seed) + return mainSecret } -// keysFromMasterSecret generates the connection keys from the master +// keysFromMainSecret generates the connection keys from the main // secret, given the lengths of the MAC key, cipher key and IV, as defined in // RFC 2246, section 6.3. -func keysFromMasterSecret(version uint16, suite *cipherSuite, masterSecret, clientRandom, serverRandom []byte, macLen, keyLen, ivLen int) (clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV []byte) { +func keysFromMainSecret(version uint16, suite *cipherSuite, mainSecret, clientRandom, serverRandom []byte, macLen, keyLen, ivLen int) (clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV []byte) { seed := make([]byte, 0, len(serverRandom)+len(clientRandom)) seed = append(seed, serverRandom...) seed = append(seed, clientRandom...) n := 2*macLen + 2*keyLen + 2*ivLen keyMaterial := make([]byte, n) - prfForVersion(version, suite)(keyMaterial, masterSecret, keyExpansionLabel, seed) + prfForVersion(version, suite)(keyMaterial, mainSecret, keyExpansionLabel, seed) clientMAC = keyMaterial[:macLen] keyMaterial = keyMaterial[macLen:] serverMAC = keyMaterial[:macLen] @@ -254,25 +254,25 @@ func (h finishedHash) Sum() []byte { // finishedSum30 calculates the contents of the verify_data member of a SSLv3 // Finished message given the MD5 and SHA1 hashes of a set of handshake // messages. -func finishedSum30(md5, sha1 hash.Hash, masterSecret []byte, magic []byte) []byte { +func finishedSum30(md5, sha1 hash.Hash, mainSecret []byte, magic []byte) []byte { md5.Write(magic) - md5.Write(masterSecret) + md5.Write(mainSecret) md5.Write(ssl30Pad1[:]) md5Digest := md5.Sum(nil) md5.Reset() - md5.Write(masterSecret) + md5.Write(mainSecret) md5.Write(ssl30Pad2[:]) md5.Write(md5Digest) md5Digest = md5.Sum(nil) sha1.Write(magic) - sha1.Write(masterSecret) + sha1.Write(mainSecret) sha1.Write(ssl30Pad1[:40]) sha1Digest := sha1.Sum(nil) sha1.Reset() - sha1.Write(masterSecret) + sha1.Write(mainSecret) sha1.Write(ssl30Pad2[:40]) sha1.Write(sha1Digest) sha1Digest = sha1.Sum(nil) @@ -288,25 +288,25 @@ var ssl3ServerFinishedMagic = [4]byte{0x53, 0x52, 0x56, 0x52} // clientSum returns the contents of the verify_data member of a client's // Finished message. -func (h finishedHash) clientSum(masterSecret []byte) []byte { +func (h finishedHash) clientSum(mainSecret []byte) []byte { if h.version == VersionSSL30 { - return finishedSum30(h.clientMD5, h.client, masterSecret, ssl3ClientFinishedMagic[:]) + return finishedSum30(h.clientMD5, h.client, mainSecret, ssl3ClientFinishedMagic[:]) } out := make([]byte, finishedVerifyLength) - h.prf(out, masterSecret, clientFinishedLabel, h.Sum()) + h.prf(out, mainSecret, clientFinishedLabel, h.Sum()) return out } // serverSum returns the contents of the verify_data member of a server's // Finished message. -func (h finishedHash) serverSum(masterSecret []byte) []byte { +func (h finishedHash) serverSum(mainSecret []byte) []byte { if h.version == VersionSSL30 { - return finishedSum30(h.serverMD5, h.server, masterSecret, ssl3ServerFinishedMagic[:]) + return finishedSum30(h.serverMD5, h.server, mainSecret, ssl3ServerFinishedMagic[:]) } out := make([]byte, finishedVerifyLength) - h.prf(out, masterSecret, serverFinishedLabel, h.Sum()) + h.prf(out, mainSecret, serverFinishedLabel, h.Sum()) return out } @@ -328,7 +328,7 @@ func (h finishedHash) selectClientCertSignatureAlgorithm(serverList []signatureA // hashForClientCertificate returns a digest, hash function, and TLS 1.2 hash // id suitable for signing by a TLS client certificate. -func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash, masterSecret []byte) ([]byte, crypto.Hash, error) { +func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash, mainSecret []byte) ([]byte, crypto.Hash, error) { if (h.version == VersionSSL30 || h.version >= VersionTLS12) && h.buffer == nil { panic("a handshake hash for a client-certificate was requested after discarding the handshake buffer") } @@ -342,7 +342,7 @@ func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash md5Hash.Write(h.buffer) sha1Hash := sha1.New() sha1Hash.Write(h.buffer) - return finishedSum30(md5Hash, sha1Hash, masterSecret, nil), crypto.MD5SHA1, nil + return finishedSum30(md5Hash, sha1Hash, mainSecret, nil), crypto.MD5SHA1, nil } if h.version >= VersionTLS12 { hashAlg, err := lookupTLSHash(signatureAndHash.hash) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf_test.go index 0a1b1bcb..accbb327 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/prf_test.go @@ -9,11 +9,11 @@ import ( "testing" ) -type testSplitPreMasterSecretTest struct { +type testSplitPreMainSecretTest struct { in, out1, out2 string } -var testSplitPreMasterSecretTests = []testSplitPreMasterSecretTest{ +var testSplitPreMainSecretTests = []testSplitPreMainSecretTest{ {"", "", ""}, {"00", "00", "00"}, {"0011", "00", "11"}, @@ -21,10 +21,10 @@ var testSplitPreMasterSecretTests = []testSplitPreMasterSecretTest{ {"00112233", "0011", "2233"}, } -func TestSplitPreMasterSecret(t *testing.T) { - for i, test := range testSplitPreMasterSecretTests { +func TestSplitPreMainSecret(t *testing.T) { + for i, test := range testSplitPreMainSecretTests { in, _ := hex.DecodeString(test.in) - out1, out2 := splitPreMasterSecret(in) + out1, out2 := splitPreMainSecret(in) s1 := hex.EncodeToString(out1) s2 := hex.EncodeToString(out2) if s1 != test.out1 || s2 != test.out2 { @@ -36,27 +36,27 @@ func TestSplitPreMasterSecret(t *testing.T) { type testKeysFromTest struct { version uint16 suite *cipherSuite - preMasterSecret string + preMainSecret string clientRandom, serverRandom string - masterSecret string + mainSecret string clientMAC, serverMAC string clientKey, serverKey string macLen, keyLen int } -func TestKeysFromPreMasterSecret(t *testing.T) { +func TestKeysFromPreMainSecret(t *testing.T) { for i, test := range testKeysFromTests { - in, _ := hex.DecodeString(test.preMasterSecret) + in, _ := hex.DecodeString(test.preMainSecret) clientRandom, _ := hex.DecodeString(test.clientRandom) serverRandom, _ := hex.DecodeString(test.serverRandom) - masterSecret := masterFromPreMasterSecret(test.version, test.suite, in, clientRandom, serverRandom) - if s := hex.EncodeToString(masterSecret); s != test.masterSecret { - t.Errorf("#%d: bad master secret %s, want %s", i, s, test.masterSecret) + mainSecret := mainFromPreMainSecret(test.version, test.suite, in, clientRandom, serverRandom) + if s := hex.EncodeToString(mainSecret); s != test.mainSecret { + t.Errorf("#%d: bad main secret %s, want %s", i, s, test.mainSecret) continue } - clientMAC, serverMAC, clientKey, serverKey, _, _ := keysFromMasterSecret(test.version, test.suite, masterSecret, clientRandom, serverRandom, test.macLen, test.keyLen, 0) + clientMAC, serverMAC, clientKey, serverKey, _, _ := keysFromMainSecret(test.version, test.suite, mainSecret, clientRandom, serverRandom, test.macLen, test.keyLen, 0) clientMACString := hex.EncodeToString(clientMAC) serverMACString := hex.EncodeToString(serverMAC) clientKeyString := hex.EncodeToString(clientKey) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/ticket.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/ticket.go index 7be50ce6..df1f9446 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/ticket.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/crypto/tls/ticket.go @@ -20,7 +20,7 @@ import ( type sessionState struct { vers uint16 cipherSuite uint16 - masterSecret []byte + mainSecret []byte certificates [][]byte // usedOldKey is true if the ticket from which this session came from // was encrypted with an older key and thus should be refreshed. @@ -35,7 +35,7 @@ func (s *sessionState) equal(i interface{}) bool { if s.vers != s1.vers || s.cipherSuite != s1.cipherSuite || - !bytes.Equal(s.masterSecret, s1.masterSecret) { + !bytes.Equal(s.mainSecret, s1.mainSecret) { return false } @@ -53,7 +53,7 @@ func (s *sessionState) equal(i interface{}) bool { } func (s *sessionState) marshal() []byte { - length := 2 + 2 + 2 + len(s.masterSecret) + 2 + length := 2 + 2 + 2 + len(s.mainSecret) + 2 for _, cert := range s.certificates { length += 4 + len(cert) } @@ -64,11 +64,11 @@ func (s *sessionState) marshal() []byte { x[1] = byte(s.vers) x[2] = byte(s.cipherSuite >> 8) x[3] = byte(s.cipherSuite) - x[4] = byte(len(s.masterSecret) >> 8) - x[5] = byte(len(s.masterSecret)) + x[4] = byte(len(s.mainSecret) >> 8) + x[5] = byte(len(s.mainSecret)) x = x[6:] - copy(x, s.masterSecret) - x = x[len(s.masterSecret):] + copy(x, s.mainSecret) + x = x[len(s.mainSecret):] x[0] = byte(len(s.certificates) >> 8) x[1] = byte(len(s.certificates)) @@ -93,14 +93,14 @@ func (s *sessionState) unmarshal(data []byte) bool { s.vers = uint16(data[0])<<8 | uint16(data[1]) s.cipherSuite = uint16(data[2])<<8 | uint16(data[3]) - masterSecretLen := int(data[4])<<8 | int(data[5]) + mainSecretLen := int(data[4])<<8 | int(data[5]) data = data[6:] - if len(data) < masterSecretLen { + if len(data) < mainSecretLen { return false } - s.masterSecret = data[:masterSecretLen] - data = data[masterSecretLen:] + s.mainSecret = data[:mainSecretLen] + data = data[mainSecretLen:] if len(data) < 2 { return false diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/html/template/example_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/html/template/example_test.go index 3fc98205..037fd8a6 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/html/template/example_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/html/template/example_test.go @@ -127,22 +127,22 @@ func Example_escape() { func ExampleTemplate_block() { const ( - master = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` + main = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` overlay = `{{define "list"}} {{join . ", "}}{{end}} ` ) var ( funcs = template.FuncMap{"join": strings.Join} guardians = []string{"Gamora", "Groot", "Nebula", "Rocket", "Star-Lord"} ) - masterTmpl, err := template.New("master").Funcs(funcs).Parse(master) + mainTmpl, err := template.New("main").Funcs(funcs).Parse(main) if err != nil { log.Fatal(err) } - overlayTmpl, err := template.Must(masterTmpl.Clone()).Parse(overlay) + overlayTmpl, err := template.Must(mainTmpl.Clone()).Parse(overlay) if err != nil { log.Fatal(err) } - if err := masterTmpl.Execute(os.Stdout, guardians); err != nil { + if err := mainTmpl.Execute(os.Stdout, guardians); err != nil { log.Fatal(err) } if err := overlayTmpl.Execute(os.Stdout, guardians); err != nil { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/mail/message_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/mail/message_test.go index 4e718e26..3a6ae10d 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/mail/message_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/mail/message_test.go @@ -550,7 +550,7 @@ func TestAddressParsingAndFormatting(t *testing.T) { `<"dot.and space"@example.com>`, `<"very.unusual.@.unusual.com"@example.com>`, ``, - ``, + ``, "<#!$%&'*+-/=?^_`{}|~@example.org>", `<"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com>`, // escaped quotes `<"()<>[]:,;@\\\"!#$%&'*+-/=?^_{}| ~.a"@example.org>`, // escaped backslashes diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/url/url_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/url/url_test.go index d3f8487b..8d6e399f 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/url/url_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/net/url/url_test.go @@ -52,10 +52,10 @@ var urltests = []URLTest{ }, // user { - "ftp://webmaster@www.google.com/", + "ftp://webmain@www.google.com/", &URL{ Scheme: "ftp", - User: User("webmaster"), + User: User("webmain"), Host: "www.google.com", Path: "/", }, @@ -127,19 +127,19 @@ var urltests = []URLTest{ }, // non-authority with path { - "mailto:/webmaster@golang.org", + "mailto:/webmain@golang.org", &URL{ Scheme: "mailto", - Path: "/webmaster@golang.org", + Path: "/webmain@golang.org", }, - "mailto:///webmaster@golang.org", // unfortunate compromise + "mailto:///webmain@golang.org", // unfortunate compromise }, // non-authority { - "mailto:webmaster@golang.org", + "mailto:webmain@golang.org", &URL{ Scheme: "mailto", - Opaque: "webmaster@golang.org", + Opaque: "webmain@golang.org", }, "", }, @@ -267,12 +267,12 @@ var urltests = []URLTest{ }, // case-insensitive scheme { - "MaIlTo:webmaster@golang.org", + "MaIlTo:webmain@golang.org", &URL{ Scheme: "mailto", - Opaque: "webmaster@golang.org", + Opaque: "webmain@golang.org", }, - "mailto:webmaster@golang.org", + "mailto:webmain@golang.org", }, // Relative path { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/example_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/example_test.go index 9cab2e83..3e328f49 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/example_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/example_test.go @@ -78,22 +78,22 @@ Josie func ExampleTemplate_block() { const ( - master = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` + main = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` overlay = `{{define "list"}} {{join . ", "}}{{end}} ` ) var ( funcs = template.FuncMap{"join": strings.Join} guardians = []string{"Gamora", "Groot", "Nebula", "Rocket", "Star-Lord"} ) - masterTmpl, err := template.New("master").Funcs(funcs).Parse(master) + mainTmpl, err := template.New("main").Funcs(funcs).Parse(main) if err != nil { log.Fatal(err) } - overlayTmpl, err := template.Must(masterTmpl.Clone()).Parse(overlay) + overlayTmpl, err := template.Must(mainTmpl.Clone()).Parse(overlay) if err != nil { log.Fatal(err) } - if err := masterTmpl.Execute(os.Stdout, guardians); err != nil { + if err := mainTmpl.Execute(os.Stdout, guardians); err != nil { log.Fatal(err) } if err := overlayTmpl.Execute(os.Stdout, guardians); err != nil { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/multi_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/multi_test.go index a8342f50..2df04176 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/multi_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.6/src/text/template/multi_test.go @@ -260,14 +260,14 @@ func TestAddParseTree(t *testing.T) { // Issue 7032 func TestAddParseTreeToUnparsedTemplate(t *testing.T) { - master := "{{define \"master\"}}{{end}}" - tmpl := New("master") - tree, err := parse.Parse("master", master, "", "", nil) + main := "{{define \"main\"}}{{end}}" + tmpl := New("main") + tree, err := parse.Parse("main", main, "", "", nil) if err != nil { t.Fatalf("unexpected parse err: %v", err) } - masterTree := tree["master"] - tmpl.AddParseTree("master", masterTree) // used to panic + mainTree := tree["main"] + tmpl.AddParseTree("main", mainTree) // used to panic } func TestRedefinition(t *testing.T) { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/dist/build.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/dist/build.go index 4306ddcd..de9ae340 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/dist/build.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/dist/build.go @@ -251,7 +251,7 @@ func chomp(s string) string { } func branchtag(branch string) (tag string, precise bool) { - b := run(goroot, CheckExit, "git", "log", "--decorate=full", "--format=format:%d", "master.."+branch) + b := run(goroot, CheckExit, "git", "log", "--decorate=full", "--format=format:%d", "main.."+branch) tag = branch for _, line := range splitlines(b) { // Each line is either blank, or looks like @@ -318,7 +318,7 @@ func findgoversion() string { precise := false // If we're on a release branch, use the closest matching tag - // that is on the release branch (and not on the master branch). + // that is on the release branch (and not on the main branch). if strings.HasPrefix(branch, "release-branch.") { tag, precise = branchtag(branch) } diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/go_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/go_test.go index 63715ae7..213508ce 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/go_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/go_test.go @@ -1257,7 +1257,7 @@ func TestGetGitDefaultBranch(t *testing.T) { tg.tempDir("src") tg.setenv("GOPATH", tg.path(".")) - // This repo has two branches, master and another-branch. + // This repo has two branches, main and another-branch. // The another-branch is the default that you get from 'git clone'. // The go get command variants should not override this. const importPath = "github.com/rsc/go-get-default-branch" diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/vcs.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/vcs.go index 644a2482..1d5e644e 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/vcs.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/cmd/go/vcs.go @@ -153,9 +153,9 @@ var vcsGit = &vcsCmd{ }, tagSyncCmd: []string{"checkout {tag}", "submodule update --init --recursive"}, // both createCmd and downloadCmd update the working dir. - // No need to do more here. We used to 'checkout master' - // but that doesn't work if the default branch is not named master. - // DO NOT add 'checkout master' here. + // No need to do more here. We used to 'checkout main' + // but that doesn't work if the default branch is not named main. + // DO NOT add 'checkout main' here. // See golang.org/issue/9032. tagSyncDefault: []string{"submodule update --init --recursive"}, diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/common.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/common.go index de833a90..da7c7e67 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/common.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/common.go @@ -175,7 +175,7 @@ type ConnectionState struct { // 5929, section 3). For resumed sessions this value will be nil // because resumption does not include enough context (see // https://secure-resumption.com/#channelbindings). This will change in - // future versions of Go once the TLS master-secret fix has been + // future versions of Go once the TLS main-secret fix has been // standardized and implemented. TLSUnique []byte } @@ -198,7 +198,7 @@ type ClientSessionState struct { sessionTicket []uint8 // Encrypted ticket used for session resumption with server vers uint16 // SSL/TLS version negotiated for the session cipherSuite uint16 // Ciphersuite negotiated for the session - masterSecret []byte // MasterSecret generated by client on a full handshake + mainSecret []byte // MainSecret generated by client on a full handshake serverCertificates []*x509.Certificate // Certificate chain presented by the server verifiedChains [][]*x509.Certificate // Certificate chains we built for verification } @@ -498,7 +498,7 @@ type Config struct { // The default, none, is correct for the vast majority of applications. Renegotiation RenegotiationSupport - // KeyLogWriter optionally specifies a destination for TLS master secrets + // KeyLogWriter optionally specifies a destination for TLS main secrets // in NSS key log format that can be used to allow external programs // such as Wireshark to decrypt TLS connections. // See https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Key_Log_Format. @@ -779,14 +779,14 @@ func (c *Config) BuildNameToCertificate() { } } -// writeKeyLog logs client random and master secret if logging was enabled by +// writeKeyLog logs client random and main secret if logging was enabled by // setting c.KeyLogWriter. -func (c *Config) writeKeyLog(clientRandom, masterSecret []byte) error { +func (c *Config) writeKeyLog(clientRandom, mainSecret []byte) error { if c.KeyLogWriter == nil { return nil } - logLine := []byte(fmt.Sprintf("CLIENT_RANDOM %x %x\n", clientRandom, masterSecret)) + logLine := []byte(fmt.Sprintf("CLIENT_RANDOM %x %x\n", clientRandom, mainSecret)) writerMutex.Lock() _, err := c.KeyLogWriter.Write(logLine) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client.go index 6eda18db..5684c853 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client.go @@ -25,7 +25,7 @@ type clientHandshakeState struct { hello *clientHelloMsg suite *cipherSuite finishedHash finishedHash - masterSecret []byte + mainSecret []byte session *ClientSessionState } @@ -409,7 +409,7 @@ func (hs *clientHandshakeState) doFullHandshake() error { } } - preMasterSecret, ckx, err := keyAgreement.generateClientKeyExchange(c.config, hs.hello, c.peerCertificates[0]) + preMainSecret, ckx, err := keyAgreement.generateClientKeyExchange(c.config, hs.hello, c.peerCertificates[0]) if err != nil { c.sendAlert(alertInternalError) return err @@ -448,7 +448,7 @@ func (hs *clientHandshakeState) doFullHandshake() error { c.sendAlert(alertInternalError) return err } - digest, hashFunc, err := hs.finishedHash.hashForClientCertificate(certVerify.signatureAndHash, hs.masterSecret) + digest, hashFunc, err := hs.finishedHash.hashForClientCertificate(certVerify.signatureAndHash, hs.mainSecret) if err != nil { c.sendAlert(alertInternalError) return err @@ -465,8 +465,8 @@ func (hs *clientHandshakeState) doFullHandshake() error { } } - hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret, hs.hello.random, hs.serverHello.random) - if err := c.config.writeKeyLog(hs.hello.random, hs.masterSecret); err != nil { + hs.mainSecret = mainFromPreMainSecret(c.vers, hs.suite, preMainSecret, hs.hello.random, hs.serverHello.random) + if err := c.config.writeKeyLog(hs.hello.random, hs.mainSecret); err != nil { c.sendAlert(alertInternalError) return errors.New("tls: failed to write to key log: " + err.Error()) } @@ -480,7 +480,7 @@ func (hs *clientHandshakeState) establishKeys() error { c := hs.c clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := - keysFromMasterSecret(c.vers, hs.suite, hs.masterSecret, hs.hello.random, hs.serverHello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) + keysFromMainSecret(c.vers, hs.suite, hs.mainSecret, hs.hello.random, hs.serverHello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) var clientCipher, serverCipher interface{} var clientHash, serverHash macFunction if hs.suite.cipher != nil { @@ -571,8 +571,8 @@ func (hs *clientHandshakeState) processServerHello() (bool, error) { return false, errors.New("tls: server resumed a session with a different cipher suite") } - // Restore masterSecret and peerCerts from previous state - hs.masterSecret = hs.session.masterSecret + // Restore mainSecret and peerCerts from previous state + hs.mainSecret = hs.session.mainSecret c.peerCertificates = hs.session.serverCertificates c.verifiedChains = hs.session.verifiedChains return true, nil @@ -596,7 +596,7 @@ func (hs *clientHandshakeState) readFinished(out []byte) error { return unexpectedMessageError(serverFinished, msg) } - verify := hs.finishedHash.serverSum(hs.masterSecret) + verify := hs.finishedHash.serverSum(hs.mainSecret) if len(verify) != len(serverFinished.verifyData) || subtle.ConstantTimeCompare(verify, serverFinished.verifyData) != 1 { c.sendAlert(alertHandshakeFailure) @@ -628,7 +628,7 @@ func (hs *clientHandshakeState) readSessionTicket() error { sessionTicket: sessionTicketMsg.ticket, vers: c.vers, cipherSuite: hs.suite.id, - masterSecret: hs.masterSecret, + mainSecret: hs.mainSecret, serverCertificates: c.peerCertificates, verifiedChains: c.verifiedChains, } @@ -656,7 +656,7 @@ func (hs *clientHandshakeState) sendFinished(out []byte) error { } finished := new(finishedMsg) - finished.verifyData = hs.finishedHash.clientSum(hs.masterSecret) + finished.verifyData = hs.finishedHash.clientSum(hs.mainSecret) hs.finishedHash.Write(finished.marshal()) if _, err := c.writeRecord(recordTypeHandshake, finished.marshal()); err != nil { return err diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client_test.go index 5851f897..0f665353 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_client_test.go @@ -828,7 +828,7 @@ func TestKeyLog(t *testing.T) { 1 /* space */ + 32*2 /* hex client nonce */ + 1 /* space */ + - 48*2 /* hex master secret */ + + 48*2 /* hex main secret */ + 1 /* new line */ if len(loggedLine) != expectedLen { t.Fatalf("%s: keylog line has incorrect length (want %d, got %d): %q", side, expectedLen, len(loggedLine), loggedLine) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_messages_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_messages_test.go index f1154d4d..58517640 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_messages_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_messages_test.go @@ -253,7 +253,7 @@ func (*sessionState) Generate(rand *rand.Rand, size int) reflect.Value { s := &sessionState{} s.vers = uint16(rand.Intn(10000)) s.cipherSuite = uint16(rand.Intn(10000)) - s.masterSecret = randomBytes(rand.Intn(100), rand) + s.mainSecret = randomBytes(rand.Intn(100), rand) numCerts := rand.Intn(20) s.certificates = make([][]byte, numCerts) for i := 0; i < numCerts; i++ { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_server.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_server.go index b786c308..4d2a1f03 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_server.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/handshake_server.go @@ -29,7 +29,7 @@ type serverHandshakeState struct { rsaSignOk bool sessionState *sessionState finishedHash finishedHash - masterSecret []byte + mainSecret []byte certsFromClient [][]byte cert *Certificate cachedClientHelloInfo *ClientHelloInfo @@ -356,7 +356,7 @@ func (hs *serverHandshakeState) doResumeHandshake() error { } } - hs.masterSecret = hs.sessionState.masterSecret + hs.mainSecret = hs.sessionState.mainSecret return nil } @@ -494,13 +494,13 @@ func (hs *serverHandshakeState) doFullHandshake() error { } hs.finishedHash.Write(ckx.marshal()) - preMasterSecret, err := keyAgreement.processClientKeyExchange(c.config, hs.cert, ckx, c.vers) + preMainSecret, err := keyAgreement.processClientKeyExchange(c.config, hs.cert, ckx, c.vers) if err != nil { c.sendAlert(alertHandshakeFailure) return err } - hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret, hs.clientHello.random, hs.hello.random) - if err := c.config.writeKeyLog(hs.clientHello.random, hs.masterSecret); err != nil { + hs.mainSecret = mainFromPreMainSecret(c.vers, hs.suite, preMainSecret, hs.clientHello.random, hs.hello.random) + if err := c.config.writeKeyLog(hs.clientHello.random, hs.mainSecret); err != nil { c.sendAlert(alertInternalError) return err } @@ -556,7 +556,7 @@ func (hs *serverHandshakeState) doFullHandshake() error { break } var digest []byte - if digest, _, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.masterSecret); err != nil { + if digest, _, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.mainSecret); err != nil { break } if !ecdsa.Verify(key, digest, ecdsaSig.R, ecdsaSig.S) { @@ -569,7 +569,7 @@ func (hs *serverHandshakeState) doFullHandshake() error { } var digest []byte var hashFunc crypto.Hash - if digest, hashFunc, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.masterSecret); err != nil { + if digest, hashFunc, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.mainSecret); err != nil { break } err = rsa.VerifyPKCS1v15(key, hashFunc, digest, certVerify.signature) @@ -591,7 +591,7 @@ func (hs *serverHandshakeState) establishKeys() error { c := hs.c clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := - keysFromMasterSecret(c.vers, hs.suite, hs.masterSecret, hs.clientHello.random, hs.hello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) + keysFromMainSecret(c.vers, hs.suite, hs.mainSecret, hs.clientHello.random, hs.hello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) var clientCipher, serverCipher interface{} var clientHash, serverHash macFunction @@ -644,7 +644,7 @@ func (hs *serverHandshakeState) readFinished(out []byte) error { return unexpectedMessageError(clientFinished, msg) } - verify := hs.finishedHash.clientSum(hs.masterSecret) + verify := hs.finishedHash.clientSum(hs.mainSecret) if len(verify) != len(clientFinished.verifyData) || subtle.ConstantTimeCompare(verify, clientFinished.verifyData) != 1 { c.sendAlert(alertHandshakeFailure) @@ -668,7 +668,7 @@ func (hs *serverHandshakeState) sendSessionTicket() error { state := sessionState{ vers: c.vers, cipherSuite: hs.suite.id, - masterSecret: hs.masterSecret, + mainSecret: hs.mainSecret, certificates: hs.certsFromClient, } m.ticket, err = c.encryptTicket(&state) @@ -692,7 +692,7 @@ func (hs *serverHandshakeState) sendFinished(out []byte) error { } finished := new(finishedMsg) - finished.verifyData = hs.finishedHash.serverSum(hs.masterSecret) + finished.verifyData = hs.finishedHash.serverSum(hs.mainSecret) hs.finishedHash.Write(finished.marshal()) if _, err := c.writeRecord(recordTypeHandshake, finished.marshal()); err != nil { return err diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/key_agreement.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/key_agreement.go index 1b27c049..e6fd7ffa 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/key_agreement.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/key_agreement.go @@ -24,7 +24,7 @@ var errClientKeyExchange = errors.New("tls: invalid ClientKeyExchange message") var errServerKeyExchange = errors.New("tls: invalid ServerKeyExchange message") // rsaKeyAgreement implements the standard TLS key agreement where the client -// encrypts the pre-master secret to the server's public key. +// encrypts the pre-main secret to the server's public key. type rsaKeyAgreement struct{} func (ka rsaKeyAgreement) generateServerKeyExchange(config *Config, cert *Certificate, clientHello *clientHelloMsg, hello *serverHelloMsg) (*serverKeyExchangeMsg, error) { @@ -49,17 +49,17 @@ func (ka rsaKeyAgreement) processClientKeyExchange(config *Config, cert *Certifi return nil, errors.New("tls: certificate private key does not implement crypto.Decrypter") } // Perform constant time RSA PKCS#1 v1.5 decryption - preMasterSecret, err := priv.Decrypt(config.rand(), ciphertext, &rsa.PKCS1v15DecryptOptions{SessionKeyLen: 48}) + preMainSecret, err := priv.Decrypt(config.rand(), ciphertext, &rsa.PKCS1v15DecryptOptions{SessionKeyLen: 48}) if err != nil { return nil, err } - // We don't check the version number in the premaster secret. For one, + // We don't check the version number in the premain secret. For one, // by checking it, we would leak information about the validity of the - // encrypted pre-master secret. Secondly, it provides only a small + // encrypted pre-main secret. Secondly, it provides only a small // benefit against a downgrade attack and some implementations send the // wrong version anyway. See the discussion at the end of section // 7.4.7.1 of RFC 4346. - return preMasterSecret, nil + return preMainSecret, nil } func (ka rsaKeyAgreement) processServerKeyExchange(config *Config, clientHello *clientHelloMsg, serverHello *serverHelloMsg, cert *x509.Certificate, skx *serverKeyExchangeMsg) error { @@ -67,15 +67,15 @@ func (ka rsaKeyAgreement) processServerKeyExchange(config *Config, clientHello * } func (ka rsaKeyAgreement) generateClientKeyExchange(config *Config, clientHello *clientHelloMsg, cert *x509.Certificate) ([]byte, *clientKeyExchangeMsg, error) { - preMasterSecret := make([]byte, 48) - preMasterSecret[0] = byte(clientHello.vers >> 8) - preMasterSecret[1] = byte(clientHello.vers) - _, err := io.ReadFull(config.rand(), preMasterSecret[2:]) + preMainSecret := make([]byte, 48) + preMainSecret[0] = byte(clientHello.vers >> 8) + preMainSecret[1] = byte(clientHello.vers) + _, err := io.ReadFull(config.rand(), preMainSecret[2:]) if err != nil { return nil, nil, err } - encrypted, err := rsa.EncryptPKCS1v15(config.rand(), cert.PublicKey.(*rsa.PublicKey), preMasterSecret) + encrypted, err := rsa.EncryptPKCS1v15(config.rand(), cert.PublicKey.(*rsa.PublicKey), preMainSecret) if err != nil { return nil, nil, err } @@ -84,7 +84,7 @@ func (ka rsaKeyAgreement) generateClientKeyExchange(config *Config, clientHello ckx.ciphertext[0] = byte(len(encrypted) >> 8) ckx.ciphertext[1] = byte(len(encrypted)) copy(ckx.ciphertext[2:], encrypted) - return preMasterSecret, ckx, nil + return preMainSecret, ckx, nil } // sha1Hash calculates a SHA1 hash over the given byte slices. @@ -173,7 +173,7 @@ func curveForCurveID(id CurveID) (elliptic.Curve, bool) { // ecdheRSAKeyAgreement implements a TLS key agreement where the server // generates a ephemeral EC public/private key pair and signs it. The -// pre-master secret is then calculated using ECDH. The signature may +// pre-main secret is then calculated using ECDH. The signature may // either be ECDSA or RSA. type ecdheKeyAgreement struct { version uint16 @@ -327,11 +327,11 @@ func (ka *ecdheKeyAgreement) processClientKeyExchange(config *Config, cert *Cert return nil, errClientKeyExchange } x, _ = curve.ScalarMult(x, y, ka.privateKey) - preMasterSecret := make([]byte, (curve.Params().BitSize+7)>>3) + preMainSecret := make([]byte, (curve.Params().BitSize+7)>>3) xBytes := x.Bytes() - copy(preMasterSecret[len(preMasterSecret)-len(xBytes):], xBytes) + copy(preMainSecret[len(preMainSecret)-len(xBytes):], xBytes) - return preMasterSecret, nil + return preMainSecret, nil } func (ka *ecdheKeyAgreement) processServerKeyExchange(config *Config, clientHello *clientHelloMsg, serverHello *serverHelloMsg, cert *x509.Certificate, skx *serverKeyExchangeMsg) error { @@ -433,7 +433,7 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel return nil, nil, errors.New("tls: missing ServerKeyExchange message") } - var serialized, preMasterSecret []byte + var serialized, preMainSecret []byte if ka.curveid == X25519 { var ourPublic, theirPublic, sharedKey, scalar [32]byte @@ -446,7 +446,7 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel curve25519.ScalarBaseMult(&ourPublic, &scalar) curve25519.ScalarMult(&sharedKey, &scalar, &theirPublic) serialized = ourPublic[:] - preMasterSecret = sharedKey[:] + preMainSecret = sharedKey[:] } else { curve, ok := curveForCurveID(ka.curveid) if !ok { @@ -457,9 +457,9 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel return nil, nil, err } x, _ := curve.ScalarMult(ka.x, ka.y, priv) - preMasterSecret = make([]byte, (curve.Params().BitSize+7)>>3) + preMainSecret = make([]byte, (curve.Params().BitSize+7)>>3) xBytes := x.Bytes() - copy(preMasterSecret[len(preMasterSecret)-len(xBytes):], xBytes) + copy(preMainSecret[len(preMainSecret)-len(xBytes):], xBytes) serialized = elliptic.Marshal(curve, mx, my) } @@ -469,5 +469,5 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel ckx.ciphertext[0] = byte(len(serialized)) copy(ckx.ciphertext[1:], serialized) - return preMasterSecret, ckx, nil + return preMainSecret, ckx, nil } diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf.go index 5833fc19..31729b89 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf.go @@ -15,8 +15,8 @@ import ( "hash" ) -// Split a premaster secret in two as specified in RFC 4346, section 5. -func splitPreMasterSecret(secret []byte) (s1, s2 []byte) { +// Split a premain secret in two as specified in RFC 4346, section 5. +func splitPreMainSecret(secret []byte) (s1, s2 []byte) { s1 = secret[0 : (len(secret)+1)/2] s2 = secret[len(secret)/2:] return @@ -56,7 +56,7 @@ func prf10(result, secret, label, seed []byte) { copy(labelAndSeed, label) copy(labelAndSeed[len(label):], seed) - s1, s2 := splitPreMasterSecret(secret) + s1, s2 := splitPreMainSecret(secret) pHash(result, s1, labelAndSeed, hashMD5) result2 := make([]byte, len(result)) pHash(result2, s2, labelAndSeed, hashSHA1) @@ -112,11 +112,11 @@ func prf30(result, secret, label, seed []byte) { const ( tlsRandomLength = 32 // Length of a random nonce in TLS 1.1. - masterSecretLength = 48 // Length of a master secret in TLS 1.1. + mainSecretLength = 48 // Length of a main secret in TLS 1.1. finishedVerifyLength = 12 // Length of verify_data in a Finished message. ) -var masterSecretLabel = []byte("master secret") +var mainSecretLabel = []byte("main secret") var keyExpansionLabel = []byte("key expansion") var clientFinishedLabel = []byte("client finished") var serverFinishedLabel = []byte("server finished") @@ -142,29 +142,29 @@ func prfForVersion(version uint16, suite *cipherSuite) func(result, secret, labe return prf } -// masterFromPreMasterSecret generates the master secret from the pre-master +// mainFromPreMainSecret generates the main secret from the pre-main // secret. See http://tools.ietf.org/html/rfc5246#section-8.1 -func masterFromPreMasterSecret(version uint16, suite *cipherSuite, preMasterSecret, clientRandom, serverRandom []byte) []byte { +func mainFromPreMainSecret(version uint16, suite *cipherSuite, preMainSecret, clientRandom, serverRandom []byte) []byte { seed := make([]byte, 0, len(clientRandom)+len(serverRandom)) seed = append(seed, clientRandom...) seed = append(seed, serverRandom...) - masterSecret := make([]byte, masterSecretLength) - prfForVersion(version, suite)(masterSecret, preMasterSecret, masterSecretLabel, seed) - return masterSecret + mainSecret := make([]byte, mainSecretLength) + prfForVersion(version, suite)(mainSecret, preMainSecret, mainSecretLabel, seed) + return mainSecret } -// keysFromMasterSecret generates the connection keys from the master +// keysFromMainSecret generates the connection keys from the main // secret, given the lengths of the MAC key, cipher key and IV, as defined in // RFC 2246, section 6.3. -func keysFromMasterSecret(version uint16, suite *cipherSuite, masterSecret, clientRandom, serverRandom []byte, macLen, keyLen, ivLen int) (clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV []byte) { +func keysFromMainSecret(version uint16, suite *cipherSuite, mainSecret, clientRandom, serverRandom []byte, macLen, keyLen, ivLen int) (clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV []byte) { seed := make([]byte, 0, len(serverRandom)+len(clientRandom)) seed = append(seed, serverRandom...) seed = append(seed, clientRandom...) n := 2*macLen + 2*keyLen + 2*ivLen keyMaterial := make([]byte, n) - prfForVersion(version, suite)(keyMaterial, masterSecret, keyExpansionLabel, seed) + prfForVersion(version, suite)(keyMaterial, mainSecret, keyExpansionLabel, seed) clientMAC = keyMaterial[:macLen] keyMaterial = keyMaterial[macLen:] serverMAC = keyMaterial[:macLen] @@ -254,25 +254,25 @@ func (h finishedHash) Sum() []byte { // finishedSum30 calculates the contents of the verify_data member of a SSLv3 // Finished message given the MD5 and SHA1 hashes of a set of handshake // messages. -func finishedSum30(md5, sha1 hash.Hash, masterSecret []byte, magic []byte) []byte { +func finishedSum30(md5, sha1 hash.Hash, mainSecret []byte, magic []byte) []byte { md5.Write(magic) - md5.Write(masterSecret) + md5.Write(mainSecret) md5.Write(ssl30Pad1[:]) md5Digest := md5.Sum(nil) md5.Reset() - md5.Write(masterSecret) + md5.Write(mainSecret) md5.Write(ssl30Pad2[:]) md5.Write(md5Digest) md5Digest = md5.Sum(nil) sha1.Write(magic) - sha1.Write(masterSecret) + sha1.Write(mainSecret) sha1.Write(ssl30Pad1[:40]) sha1Digest := sha1.Sum(nil) sha1.Reset() - sha1.Write(masterSecret) + sha1.Write(mainSecret) sha1.Write(ssl30Pad2[:40]) sha1.Write(sha1Digest) sha1Digest = sha1.Sum(nil) @@ -288,25 +288,25 @@ var ssl3ServerFinishedMagic = [4]byte{0x53, 0x52, 0x56, 0x52} // clientSum returns the contents of the verify_data member of a client's // Finished message. -func (h finishedHash) clientSum(masterSecret []byte) []byte { +func (h finishedHash) clientSum(mainSecret []byte) []byte { if h.version == VersionSSL30 { - return finishedSum30(h.clientMD5, h.client, masterSecret, ssl3ClientFinishedMagic[:]) + return finishedSum30(h.clientMD5, h.client, mainSecret, ssl3ClientFinishedMagic[:]) } out := make([]byte, finishedVerifyLength) - h.prf(out, masterSecret, clientFinishedLabel, h.Sum()) + h.prf(out, mainSecret, clientFinishedLabel, h.Sum()) return out } // serverSum returns the contents of the verify_data member of a server's // Finished message. -func (h finishedHash) serverSum(masterSecret []byte) []byte { +func (h finishedHash) serverSum(mainSecret []byte) []byte { if h.version == VersionSSL30 { - return finishedSum30(h.serverMD5, h.server, masterSecret, ssl3ServerFinishedMagic[:]) + return finishedSum30(h.serverMD5, h.server, mainSecret, ssl3ServerFinishedMagic[:]) } out := make([]byte, finishedVerifyLength) - h.prf(out, masterSecret, serverFinishedLabel, h.Sum()) + h.prf(out, mainSecret, serverFinishedLabel, h.Sum()) return out } @@ -328,7 +328,7 @@ func (h finishedHash) selectClientCertSignatureAlgorithm(serverList []signatureA // hashForClientCertificate returns a digest, hash function, and TLS 1.2 hash // id suitable for signing by a TLS client certificate. -func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash, masterSecret []byte) ([]byte, crypto.Hash, error) { +func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash, mainSecret []byte) ([]byte, crypto.Hash, error) { if (h.version == VersionSSL30 || h.version >= VersionTLS12) && h.buffer == nil { panic("a handshake hash for a client-certificate was requested after discarding the handshake buffer") } @@ -342,7 +342,7 @@ func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash md5Hash.Write(h.buffer) sha1Hash := sha1.New() sha1Hash.Write(h.buffer) - return finishedSum30(md5Hash, sha1Hash, masterSecret, nil), crypto.MD5SHA1, nil + return finishedSum30(md5Hash, sha1Hash, mainSecret, nil), crypto.MD5SHA1, nil } if h.version >= VersionTLS12 { hashAlg, err := lookupTLSHash(signatureAndHash.hash) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf_test.go index 0a1b1bcb..accbb327 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/prf_test.go @@ -9,11 +9,11 @@ import ( "testing" ) -type testSplitPreMasterSecretTest struct { +type testSplitPreMainSecretTest struct { in, out1, out2 string } -var testSplitPreMasterSecretTests = []testSplitPreMasterSecretTest{ +var testSplitPreMainSecretTests = []testSplitPreMainSecretTest{ {"", "", ""}, {"00", "00", "00"}, {"0011", "00", "11"}, @@ -21,10 +21,10 @@ var testSplitPreMasterSecretTests = []testSplitPreMasterSecretTest{ {"00112233", "0011", "2233"}, } -func TestSplitPreMasterSecret(t *testing.T) { - for i, test := range testSplitPreMasterSecretTests { +func TestSplitPreMainSecret(t *testing.T) { + for i, test := range testSplitPreMainSecretTests { in, _ := hex.DecodeString(test.in) - out1, out2 := splitPreMasterSecret(in) + out1, out2 := splitPreMainSecret(in) s1 := hex.EncodeToString(out1) s2 := hex.EncodeToString(out2) if s1 != test.out1 || s2 != test.out2 { @@ -36,27 +36,27 @@ func TestSplitPreMasterSecret(t *testing.T) { type testKeysFromTest struct { version uint16 suite *cipherSuite - preMasterSecret string + preMainSecret string clientRandom, serverRandom string - masterSecret string + mainSecret string clientMAC, serverMAC string clientKey, serverKey string macLen, keyLen int } -func TestKeysFromPreMasterSecret(t *testing.T) { +func TestKeysFromPreMainSecret(t *testing.T) { for i, test := range testKeysFromTests { - in, _ := hex.DecodeString(test.preMasterSecret) + in, _ := hex.DecodeString(test.preMainSecret) clientRandom, _ := hex.DecodeString(test.clientRandom) serverRandom, _ := hex.DecodeString(test.serverRandom) - masterSecret := masterFromPreMasterSecret(test.version, test.suite, in, clientRandom, serverRandom) - if s := hex.EncodeToString(masterSecret); s != test.masterSecret { - t.Errorf("#%d: bad master secret %s, want %s", i, s, test.masterSecret) + mainSecret := mainFromPreMainSecret(test.version, test.suite, in, clientRandom, serverRandom) + if s := hex.EncodeToString(mainSecret); s != test.mainSecret { + t.Errorf("#%d: bad main secret %s, want %s", i, s, test.mainSecret) continue } - clientMAC, serverMAC, clientKey, serverKey, _, _ := keysFromMasterSecret(test.version, test.suite, masterSecret, clientRandom, serverRandom, test.macLen, test.keyLen, 0) + clientMAC, serverMAC, clientKey, serverKey, _, _ := keysFromMainSecret(test.version, test.suite, mainSecret, clientRandom, serverRandom, test.macLen, test.keyLen, 0) clientMACString := hex.EncodeToString(clientMAC) serverMACString := hex.EncodeToString(serverMAC) clientKeyString := hex.EncodeToString(clientKey) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/ticket.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/ticket.go index 3e7aa93c..2216dba2 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/ticket.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/crypto/tls/ticket.go @@ -20,7 +20,7 @@ import ( type sessionState struct { vers uint16 cipherSuite uint16 - masterSecret []byte + mainSecret []byte certificates [][]byte // usedOldKey is true if the ticket from which this session came from // was encrypted with an older key and thus should be refreshed. @@ -35,7 +35,7 @@ func (s *sessionState) equal(i interface{}) bool { if s.vers != s1.vers || s.cipherSuite != s1.cipherSuite || - !bytes.Equal(s.masterSecret, s1.masterSecret) { + !bytes.Equal(s.mainSecret, s1.mainSecret) { return false } @@ -53,7 +53,7 @@ func (s *sessionState) equal(i interface{}) bool { } func (s *sessionState) marshal() []byte { - length := 2 + 2 + 2 + len(s.masterSecret) + 2 + length := 2 + 2 + 2 + len(s.mainSecret) + 2 for _, cert := range s.certificates { length += 4 + len(cert) } @@ -64,11 +64,11 @@ func (s *sessionState) marshal() []byte { x[1] = byte(s.vers) x[2] = byte(s.cipherSuite >> 8) x[3] = byte(s.cipherSuite) - x[4] = byte(len(s.masterSecret) >> 8) - x[5] = byte(len(s.masterSecret)) + x[4] = byte(len(s.mainSecret) >> 8) + x[5] = byte(len(s.mainSecret)) x = x[6:] - copy(x, s.masterSecret) - x = x[len(s.masterSecret):] + copy(x, s.mainSecret) + x = x[len(s.mainSecret):] x[0] = byte(len(s.certificates) >> 8) x[1] = byte(len(s.certificates)) @@ -93,14 +93,14 @@ func (s *sessionState) unmarshal(data []byte) bool { s.vers = uint16(data[0])<<8 | uint16(data[1]) s.cipherSuite = uint16(data[2])<<8 | uint16(data[3]) - masterSecretLen := int(data[4])<<8 | int(data[5]) + mainSecretLen := int(data[4])<<8 | int(data[5]) data = data[6:] - if len(data) < masterSecretLen { + if len(data) < mainSecretLen { return false } - s.masterSecret = data[:masterSecretLen] - data = data[masterSecretLen:] + s.mainSecret = data[:mainSecretLen] + data = data[mainSecretLen:] if len(data) < 2 { return false diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/html/template/example_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/html/template/example_test.go index 3fc98205..037fd8a6 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/html/template/example_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/html/template/example_test.go @@ -127,22 +127,22 @@ func Example_escape() { func ExampleTemplate_block() { const ( - master = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` + main = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` overlay = `{{define "list"}} {{join . ", "}}{{end}} ` ) var ( funcs = template.FuncMap{"join": strings.Join} guardians = []string{"Gamora", "Groot", "Nebula", "Rocket", "Star-Lord"} ) - masterTmpl, err := template.New("master").Funcs(funcs).Parse(master) + mainTmpl, err := template.New("main").Funcs(funcs).Parse(main) if err != nil { log.Fatal(err) } - overlayTmpl, err := template.Must(masterTmpl.Clone()).Parse(overlay) + overlayTmpl, err := template.Must(mainTmpl.Clone()).Parse(overlay) if err != nil { log.Fatal(err) } - if err := masterTmpl.Execute(os.Stdout, guardians); err != nil { + if err := mainTmpl.Execute(os.Stdout, guardians); err != nil { log.Fatal(err) } if err := overlayTmpl.Execute(os.Stdout, guardians); err != nil { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/internal/syscall/unix/getentropy_openbsd.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/internal/syscall/unix/getentropy_openbsd.go index d5caa809..04db5e1f 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/internal/syscall/unix/getentropy_openbsd.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/internal/syscall/unix/getentropy_openbsd.go @@ -9,7 +9,7 @@ import ( "unsafe" ) -// getentropy(2)'s syscall number, from /usr/src/sys/kern/syscalls.master +// getentropy(2)'s syscall number, from /usr/src/sys/kern/syscalls.main const entropyTrap uintptr = 7 // GetEntropy calls the OpenBSD getentropy system call. diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/mail/message_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/mail/message_test.go index f0761ab0..4fe7bd71 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/mail/message_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/mail/message_test.go @@ -616,7 +616,7 @@ func TestAddressParsingAndFormatting(t *testing.T) { `<"dot.and space"@example.com>`, `<"very.unusual.@.unusual.com"@example.com>`, ``, - ``, + ``, "<#!$%&'*+-/=?^_`{}|~@example.org>", `<"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com>`, // escaped quotes `<"()<>[]:,;@\\\"!#$%&'*+-/=?^_{}| ~.a"@example.org>`, // escaped backslashes diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/url/url_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/url/url_test.go index 6c3bb21d..221c9ea8 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/url/url_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/net/url/url_test.go @@ -56,10 +56,10 @@ var urltests = []URLTest{ }, // user { - "ftp://webmaster@www.google.com/", + "ftp://webmain@www.google.com/", &URL{ Scheme: "ftp", - User: User("webmaster"), + User: User("webmain"), Host: "www.google.com", Path: "/", }, @@ -153,19 +153,19 @@ var urltests = []URLTest{ }, // non-authority with path { - "mailto:/webmaster@golang.org", + "mailto:/webmain@golang.org", &URL{ Scheme: "mailto", - Path: "/webmaster@golang.org", + Path: "/webmain@golang.org", }, - "mailto:///webmaster@golang.org", // unfortunate compromise + "mailto:///webmain@golang.org", // unfortunate compromise }, // non-authority { - "mailto:webmaster@golang.org", + "mailto:webmain@golang.org", &URL{ Scheme: "mailto", - Opaque: "webmaster@golang.org", + Opaque: "webmain@golang.org", }, "", }, @@ -293,12 +293,12 @@ var urltests = []URLTest{ }, // case-insensitive scheme { - "MaIlTo:webmaster@golang.org", + "MaIlTo:webmain@golang.org", &URL{ Scheme: "mailto", - Opaque: "webmaster@golang.org", + Opaque: "webmain@golang.org", }, - "mailto:webmaster@golang.org", + "mailto:webmain@golang.org", }, // Relative path { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/example_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/example_test.go index 9cab2e83..3e328f49 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/example_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/example_test.go @@ -78,22 +78,22 @@ Josie func ExampleTemplate_block() { const ( - master = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` + main = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` overlay = `{{define "list"}} {{join . ", "}}{{end}} ` ) var ( funcs = template.FuncMap{"join": strings.Join} guardians = []string{"Gamora", "Groot", "Nebula", "Rocket", "Star-Lord"} ) - masterTmpl, err := template.New("master").Funcs(funcs).Parse(master) + mainTmpl, err := template.New("main").Funcs(funcs).Parse(main) if err != nil { log.Fatal(err) } - overlayTmpl, err := template.Must(masterTmpl.Clone()).Parse(overlay) + overlayTmpl, err := template.Must(mainTmpl.Clone()).Parse(overlay) if err != nil { log.Fatal(err) } - if err := masterTmpl.Execute(os.Stdout, guardians); err != nil { + if err := mainTmpl.Execute(os.Stdout, guardians); err != nil { log.Fatal(err) } if err := overlayTmpl.Execute(os.Stdout, guardians); err != nil { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/multi_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/multi_test.go index 5d8c08f0..2712ea45 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/multi_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.8/src/text/template/multi_test.go @@ -260,14 +260,14 @@ func TestAddParseTree(t *testing.T) { // Issue 7032 func TestAddParseTreeToUnparsedTemplate(t *testing.T) { - master := "{{define \"master\"}}{{end}}" - tmpl := New("master") - tree, err := parse.Parse("master", master, "", "", nil) + main := "{{define \"main\"}}{{end}}" + tmpl := New("main") + tree, err := parse.Parse("main", main, "", "", nil) if err != nil { t.Fatalf("unexpected parse err: %v", err) } - masterTree := tree["master"] - tmpl.AddParseTree("master", masterTree) // used to panic + mainTree := tree["main"] + tmpl.AddParseTree("main", mainTree) // used to panic } func TestRedefinition(t *testing.T) { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/dist/build.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/dist/build.go index 868df0c0..056ba240 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/dist/build.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/dist/build.go @@ -251,7 +251,7 @@ func chomp(s string) string { } func branchtag(branch string) (tag string, precise bool) { - b := run(goroot, CheckExit, "git", "log", "--decorate=full", "--format=format:%d", "master.."+branch) + b := run(goroot, CheckExit, "git", "log", "--decorate=full", "--format=format:%d", "main.."+branch) tag = branch for _, line := range splitlines(b) { // Each line is either blank, or looks like @@ -318,7 +318,7 @@ func findgoversion() string { precise := false // If we're on a release branch, use the closest matching tag - // that is on the release branch (and not on the master branch). + // that is on the release branch (and not on the main branch). if strings.HasPrefix(branch, "release-branch.") { tag, precise = branchtag(branch) } diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/go_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/go_test.go index 28c2bc14..bfc9038c 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/go_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/go_test.go @@ -1301,7 +1301,7 @@ func TestGetGitDefaultBranch(t *testing.T) { tg.tempDir("src") tg.setenv("GOPATH", tg.path(".")) - // This repo has two branches, master and another-branch. + // This repo has two branches, main and another-branch. // The another-branch is the default that you get from 'git clone'. // The go get command variants should not override this. const importPath = "github.com/rsc/go-get-default-branch" diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/internal/get/vcs.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/internal/get/vcs.go index 86d2e32e..b5fe2d85 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/internal/get/vcs.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/cmd/go/internal/get/vcs.go @@ -157,9 +157,9 @@ var vcsGit = &vcsCmd{ }, tagSyncCmd: []string{"checkout {tag}", "submodule update --init --recursive"}, // both createCmd and downloadCmd update the working dir. - // No need to do more here. We used to 'checkout master' - // but that doesn't work if the default branch is not named master. - // DO NOT add 'checkout master' here. + // No need to do more here. We used to 'checkout main' + // but that doesn't work if the default branch is not named main. + // DO NOT add 'checkout main' here. // See golang.org/issue/9032. tagSyncDefault: []string{"submodule update --init --recursive"}, diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/common.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/common.go index 5860838d..ef398d6b 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/common.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/common.go @@ -175,7 +175,7 @@ type ConnectionState struct { // 5929, section 3). For resumed sessions this value will be nil // because resumption does not include enough context (see // https://mitls.org/pages/attacks/3SHAKE#channelbindings). This will - // change in future versions of Go once the TLS master-secret fix has + // change in future versions of Go once the TLS main-secret fix has // been standardized and implemented. TLSUnique []byte } @@ -198,7 +198,7 @@ type ClientSessionState struct { sessionTicket []uint8 // Encrypted ticket used for session resumption with server vers uint16 // SSL/TLS version negotiated for the session cipherSuite uint16 // Ciphersuite negotiated for the session - masterSecret []byte // MasterSecret generated by client on a full handshake + mainSecret []byte // MainSecret generated by client on a full handshake serverCertificates []*x509.Certificate // Certificate chain presented by the server verifiedChains [][]*x509.Certificate // Certificate chains we built for verification } @@ -499,7 +499,7 @@ type Config struct { // The default, none, is correct for the vast majority of applications. Renegotiation RenegotiationSupport - // KeyLogWriter optionally specifies a destination for TLS master secrets + // KeyLogWriter optionally specifies a destination for TLS main secrets // in NSS key log format that can be used to allow external programs // such as Wireshark to decrypt TLS connections. // See https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Key_Log_Format. @@ -773,14 +773,14 @@ func (c *Config) BuildNameToCertificate() { } } -// writeKeyLog logs client random and master secret if logging was enabled by +// writeKeyLog logs client random and main secret if logging was enabled by // setting c.KeyLogWriter. -func (c *Config) writeKeyLog(clientRandom, masterSecret []byte) error { +func (c *Config) writeKeyLog(clientRandom, mainSecret []byte) error { if c.KeyLogWriter == nil { return nil } - logLine := []byte(fmt.Sprintf("CLIENT_RANDOM %x %x\n", clientRandom, masterSecret)) + logLine := []byte(fmt.Sprintf("CLIENT_RANDOM %x %x\n", clientRandom, mainSecret)) writerMutex.Lock() _, err := c.KeyLogWriter.Write(logLine) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client.go index a4ca5d34..61b256cd 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client.go @@ -25,7 +25,7 @@ type clientHandshakeState struct { hello *clientHelloMsg suite *cipherSuite finishedHash finishedHash - masterSecret []byte + mainSecret []byte session *ClientSessionState } @@ -409,7 +409,7 @@ func (hs *clientHandshakeState) doFullHandshake() error { } } - preMasterSecret, ckx, err := keyAgreement.generateClientKeyExchange(c.config, hs.hello, c.peerCertificates[0]) + preMainSecret, ckx, err := keyAgreement.generateClientKeyExchange(c.config, hs.hello, c.peerCertificates[0]) if err != nil { c.sendAlert(alertInternalError) return err @@ -448,7 +448,7 @@ func (hs *clientHandshakeState) doFullHandshake() error { c.sendAlert(alertInternalError) return err } - digest, hashFunc, err := hs.finishedHash.hashForClientCertificate(certVerify.signatureAndHash, hs.masterSecret) + digest, hashFunc, err := hs.finishedHash.hashForClientCertificate(certVerify.signatureAndHash, hs.mainSecret) if err != nil { c.sendAlert(alertInternalError) return err @@ -465,8 +465,8 @@ func (hs *clientHandshakeState) doFullHandshake() error { } } - hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret, hs.hello.random, hs.serverHello.random) - if err := c.config.writeKeyLog(hs.hello.random, hs.masterSecret); err != nil { + hs.mainSecret = mainFromPreMainSecret(c.vers, hs.suite, preMainSecret, hs.hello.random, hs.serverHello.random) + if err := c.config.writeKeyLog(hs.hello.random, hs.mainSecret); err != nil { c.sendAlert(alertInternalError) return errors.New("tls: failed to write to key log: " + err.Error()) } @@ -480,7 +480,7 @@ func (hs *clientHandshakeState) establishKeys() error { c := hs.c clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := - keysFromMasterSecret(c.vers, hs.suite, hs.masterSecret, hs.hello.random, hs.serverHello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) + keysFromMainSecret(c.vers, hs.suite, hs.mainSecret, hs.hello.random, hs.serverHello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) var clientCipher, serverCipher interface{} var clientHash, serverHash macFunction if hs.suite.cipher != nil { @@ -571,8 +571,8 @@ func (hs *clientHandshakeState) processServerHello() (bool, error) { return false, errors.New("tls: server resumed a session with a different cipher suite") } - // Restore masterSecret and peerCerts from previous state - hs.masterSecret = hs.session.masterSecret + // Restore mainSecret and peerCerts from previous state + hs.mainSecret = hs.session.mainSecret c.peerCertificates = hs.session.serverCertificates c.verifiedChains = hs.session.verifiedChains return true, nil @@ -596,7 +596,7 @@ func (hs *clientHandshakeState) readFinished(out []byte) error { return unexpectedMessageError(serverFinished, msg) } - verify := hs.finishedHash.serverSum(hs.masterSecret) + verify := hs.finishedHash.serverSum(hs.mainSecret) if len(verify) != len(serverFinished.verifyData) || subtle.ConstantTimeCompare(verify, serverFinished.verifyData) != 1 { c.sendAlert(alertHandshakeFailure) @@ -628,7 +628,7 @@ func (hs *clientHandshakeState) readSessionTicket() error { sessionTicket: sessionTicketMsg.ticket, vers: c.vers, cipherSuite: hs.suite.id, - masterSecret: hs.masterSecret, + mainSecret: hs.mainSecret, serverCertificates: c.peerCertificates, verifiedChains: c.verifiedChains, } @@ -656,7 +656,7 @@ func (hs *clientHandshakeState) sendFinished(out []byte) error { } finished := new(finishedMsg) - finished.verifyData = hs.finishedHash.clientSum(hs.masterSecret) + finished.verifyData = hs.finishedHash.clientSum(hs.mainSecret) hs.finishedHash.Write(finished.marshal()) if _, err := c.writeRecord(recordTypeHandshake, finished.marshal()); err != nil { return err diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client_test.go index 5851f897..0f665353 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_client_test.go @@ -828,7 +828,7 @@ func TestKeyLog(t *testing.T) { 1 /* space */ + 32*2 /* hex client nonce */ + 1 /* space */ + - 48*2 /* hex master secret */ + + 48*2 /* hex main secret */ + 1 /* new line */ if len(loggedLine) != expectedLen { t.Fatalf("%s: keylog line has incorrect length (want %d, got %d): %q", side, expectedLen, len(loggedLine), loggedLine) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_messages_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_messages_test.go index 7add97c3..14f66304 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_messages_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_messages_test.go @@ -257,7 +257,7 @@ func (*sessionState) Generate(rand *rand.Rand, size int) reflect.Value { s := &sessionState{} s.vers = uint16(rand.Intn(10000)) s.cipherSuite = uint16(rand.Intn(10000)) - s.masterSecret = randomBytes(rand.Intn(100), rand) + s.mainSecret = randomBytes(rand.Intn(100), rand) numCerts := rand.Intn(20) s.certificates = make([][]byte, numCerts) for i := 0; i < numCerts; i++ { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_server.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_server.go index ae328487..c04745c6 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_server.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/handshake_server.go @@ -29,7 +29,7 @@ type serverHandshakeState struct { rsaSignOk bool sessionState *sessionState finishedHash finishedHash - masterSecret []byte + mainSecret []byte certsFromClient [][]byte cert *Certificate cachedClientHelloInfo *ClientHelloInfo @@ -352,7 +352,7 @@ func (hs *serverHandshakeState) doResumeHandshake() error { } } - hs.masterSecret = hs.sessionState.masterSecret + hs.mainSecret = hs.sessionState.mainSecret return nil } @@ -490,13 +490,13 @@ func (hs *serverHandshakeState) doFullHandshake() error { } hs.finishedHash.Write(ckx.marshal()) - preMasterSecret, err := keyAgreement.processClientKeyExchange(c.config, hs.cert, ckx, c.vers) + preMainSecret, err := keyAgreement.processClientKeyExchange(c.config, hs.cert, ckx, c.vers) if err != nil { c.sendAlert(alertHandshakeFailure) return err } - hs.masterSecret = masterFromPreMasterSecret(c.vers, hs.suite, preMasterSecret, hs.clientHello.random, hs.hello.random) - if err := c.config.writeKeyLog(hs.clientHello.random, hs.masterSecret); err != nil { + hs.mainSecret = mainFromPreMainSecret(c.vers, hs.suite, preMainSecret, hs.clientHello.random, hs.hello.random) + if err := c.config.writeKeyLog(hs.clientHello.random, hs.mainSecret); err != nil { c.sendAlert(alertInternalError) return err } @@ -552,7 +552,7 @@ func (hs *serverHandshakeState) doFullHandshake() error { break } var digest []byte - if digest, _, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.masterSecret); err != nil { + if digest, _, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.mainSecret); err != nil { break } if !ecdsa.Verify(key, digest, ecdsaSig.R, ecdsaSig.S) { @@ -565,7 +565,7 @@ func (hs *serverHandshakeState) doFullHandshake() error { } var digest []byte var hashFunc crypto.Hash - if digest, hashFunc, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.masterSecret); err != nil { + if digest, hashFunc, err = hs.finishedHash.hashForClientCertificate(signatureAndHash, hs.mainSecret); err != nil { break } err = rsa.VerifyPKCS1v15(key, hashFunc, digest, certVerify.signature) @@ -587,7 +587,7 @@ func (hs *serverHandshakeState) establishKeys() error { c := hs.c clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV := - keysFromMasterSecret(c.vers, hs.suite, hs.masterSecret, hs.clientHello.random, hs.hello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) + keysFromMainSecret(c.vers, hs.suite, hs.mainSecret, hs.clientHello.random, hs.hello.random, hs.suite.macLen, hs.suite.keyLen, hs.suite.ivLen) var clientCipher, serverCipher interface{} var clientHash, serverHash macFunction @@ -640,7 +640,7 @@ func (hs *serverHandshakeState) readFinished(out []byte) error { return unexpectedMessageError(clientFinished, msg) } - verify := hs.finishedHash.clientSum(hs.masterSecret) + verify := hs.finishedHash.clientSum(hs.mainSecret) if len(verify) != len(clientFinished.verifyData) || subtle.ConstantTimeCompare(verify, clientFinished.verifyData) != 1 { c.sendAlert(alertHandshakeFailure) @@ -664,7 +664,7 @@ func (hs *serverHandshakeState) sendSessionTicket() error { state := sessionState{ vers: c.vers, cipherSuite: hs.suite.id, - masterSecret: hs.masterSecret, + mainSecret: hs.mainSecret, certificates: hs.certsFromClient, } m.ticket, err = c.encryptTicket(&state) @@ -688,7 +688,7 @@ func (hs *serverHandshakeState) sendFinished(out []byte) error { } finished := new(finishedMsg) - finished.verifyData = hs.finishedHash.serverSum(hs.masterSecret) + finished.verifyData = hs.finishedHash.serverSum(hs.mainSecret) hs.finishedHash.Write(finished.marshal()) if _, err := c.writeRecord(recordTypeHandshake, finished.marshal()); err != nil { return err diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/key_agreement.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/key_agreement.go index 1b27c049..e6fd7ffa 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/key_agreement.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/key_agreement.go @@ -24,7 +24,7 @@ var errClientKeyExchange = errors.New("tls: invalid ClientKeyExchange message") var errServerKeyExchange = errors.New("tls: invalid ServerKeyExchange message") // rsaKeyAgreement implements the standard TLS key agreement where the client -// encrypts the pre-master secret to the server's public key. +// encrypts the pre-main secret to the server's public key. type rsaKeyAgreement struct{} func (ka rsaKeyAgreement) generateServerKeyExchange(config *Config, cert *Certificate, clientHello *clientHelloMsg, hello *serverHelloMsg) (*serverKeyExchangeMsg, error) { @@ -49,17 +49,17 @@ func (ka rsaKeyAgreement) processClientKeyExchange(config *Config, cert *Certifi return nil, errors.New("tls: certificate private key does not implement crypto.Decrypter") } // Perform constant time RSA PKCS#1 v1.5 decryption - preMasterSecret, err := priv.Decrypt(config.rand(), ciphertext, &rsa.PKCS1v15DecryptOptions{SessionKeyLen: 48}) + preMainSecret, err := priv.Decrypt(config.rand(), ciphertext, &rsa.PKCS1v15DecryptOptions{SessionKeyLen: 48}) if err != nil { return nil, err } - // We don't check the version number in the premaster secret. For one, + // We don't check the version number in the premain secret. For one, // by checking it, we would leak information about the validity of the - // encrypted pre-master secret. Secondly, it provides only a small + // encrypted pre-main secret. Secondly, it provides only a small // benefit against a downgrade attack and some implementations send the // wrong version anyway. See the discussion at the end of section // 7.4.7.1 of RFC 4346. - return preMasterSecret, nil + return preMainSecret, nil } func (ka rsaKeyAgreement) processServerKeyExchange(config *Config, clientHello *clientHelloMsg, serverHello *serverHelloMsg, cert *x509.Certificate, skx *serverKeyExchangeMsg) error { @@ -67,15 +67,15 @@ func (ka rsaKeyAgreement) processServerKeyExchange(config *Config, clientHello * } func (ka rsaKeyAgreement) generateClientKeyExchange(config *Config, clientHello *clientHelloMsg, cert *x509.Certificate) ([]byte, *clientKeyExchangeMsg, error) { - preMasterSecret := make([]byte, 48) - preMasterSecret[0] = byte(clientHello.vers >> 8) - preMasterSecret[1] = byte(clientHello.vers) - _, err := io.ReadFull(config.rand(), preMasterSecret[2:]) + preMainSecret := make([]byte, 48) + preMainSecret[0] = byte(clientHello.vers >> 8) + preMainSecret[1] = byte(clientHello.vers) + _, err := io.ReadFull(config.rand(), preMainSecret[2:]) if err != nil { return nil, nil, err } - encrypted, err := rsa.EncryptPKCS1v15(config.rand(), cert.PublicKey.(*rsa.PublicKey), preMasterSecret) + encrypted, err := rsa.EncryptPKCS1v15(config.rand(), cert.PublicKey.(*rsa.PublicKey), preMainSecret) if err != nil { return nil, nil, err } @@ -84,7 +84,7 @@ func (ka rsaKeyAgreement) generateClientKeyExchange(config *Config, clientHello ckx.ciphertext[0] = byte(len(encrypted) >> 8) ckx.ciphertext[1] = byte(len(encrypted)) copy(ckx.ciphertext[2:], encrypted) - return preMasterSecret, ckx, nil + return preMainSecret, ckx, nil } // sha1Hash calculates a SHA1 hash over the given byte slices. @@ -173,7 +173,7 @@ func curveForCurveID(id CurveID) (elliptic.Curve, bool) { // ecdheRSAKeyAgreement implements a TLS key agreement where the server // generates a ephemeral EC public/private key pair and signs it. The -// pre-master secret is then calculated using ECDH. The signature may +// pre-main secret is then calculated using ECDH. The signature may // either be ECDSA or RSA. type ecdheKeyAgreement struct { version uint16 @@ -327,11 +327,11 @@ func (ka *ecdheKeyAgreement) processClientKeyExchange(config *Config, cert *Cert return nil, errClientKeyExchange } x, _ = curve.ScalarMult(x, y, ka.privateKey) - preMasterSecret := make([]byte, (curve.Params().BitSize+7)>>3) + preMainSecret := make([]byte, (curve.Params().BitSize+7)>>3) xBytes := x.Bytes() - copy(preMasterSecret[len(preMasterSecret)-len(xBytes):], xBytes) + copy(preMainSecret[len(preMainSecret)-len(xBytes):], xBytes) - return preMasterSecret, nil + return preMainSecret, nil } func (ka *ecdheKeyAgreement) processServerKeyExchange(config *Config, clientHello *clientHelloMsg, serverHello *serverHelloMsg, cert *x509.Certificate, skx *serverKeyExchangeMsg) error { @@ -433,7 +433,7 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel return nil, nil, errors.New("tls: missing ServerKeyExchange message") } - var serialized, preMasterSecret []byte + var serialized, preMainSecret []byte if ka.curveid == X25519 { var ourPublic, theirPublic, sharedKey, scalar [32]byte @@ -446,7 +446,7 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel curve25519.ScalarBaseMult(&ourPublic, &scalar) curve25519.ScalarMult(&sharedKey, &scalar, &theirPublic) serialized = ourPublic[:] - preMasterSecret = sharedKey[:] + preMainSecret = sharedKey[:] } else { curve, ok := curveForCurveID(ka.curveid) if !ok { @@ -457,9 +457,9 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel return nil, nil, err } x, _ := curve.ScalarMult(ka.x, ka.y, priv) - preMasterSecret = make([]byte, (curve.Params().BitSize+7)>>3) + preMainSecret = make([]byte, (curve.Params().BitSize+7)>>3) xBytes := x.Bytes() - copy(preMasterSecret[len(preMasterSecret)-len(xBytes):], xBytes) + copy(preMainSecret[len(preMainSecret)-len(xBytes):], xBytes) serialized = elliptic.Marshal(curve, mx, my) } @@ -469,5 +469,5 @@ func (ka *ecdheKeyAgreement) generateClientKeyExchange(config *Config, clientHel ckx.ciphertext[0] = byte(len(serialized)) copy(ckx.ciphertext[1:], serialized) - return preMasterSecret, ckx, nil + return preMainSecret, ckx, nil } diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf.go index 5833fc19..31729b89 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf.go @@ -15,8 +15,8 @@ import ( "hash" ) -// Split a premaster secret in two as specified in RFC 4346, section 5. -func splitPreMasterSecret(secret []byte) (s1, s2 []byte) { +// Split a premain secret in two as specified in RFC 4346, section 5. +func splitPreMainSecret(secret []byte) (s1, s2 []byte) { s1 = secret[0 : (len(secret)+1)/2] s2 = secret[len(secret)/2:] return @@ -56,7 +56,7 @@ func prf10(result, secret, label, seed []byte) { copy(labelAndSeed, label) copy(labelAndSeed[len(label):], seed) - s1, s2 := splitPreMasterSecret(secret) + s1, s2 := splitPreMainSecret(secret) pHash(result, s1, labelAndSeed, hashMD5) result2 := make([]byte, len(result)) pHash(result2, s2, labelAndSeed, hashSHA1) @@ -112,11 +112,11 @@ func prf30(result, secret, label, seed []byte) { const ( tlsRandomLength = 32 // Length of a random nonce in TLS 1.1. - masterSecretLength = 48 // Length of a master secret in TLS 1.1. + mainSecretLength = 48 // Length of a main secret in TLS 1.1. finishedVerifyLength = 12 // Length of verify_data in a Finished message. ) -var masterSecretLabel = []byte("master secret") +var mainSecretLabel = []byte("main secret") var keyExpansionLabel = []byte("key expansion") var clientFinishedLabel = []byte("client finished") var serverFinishedLabel = []byte("server finished") @@ -142,29 +142,29 @@ func prfForVersion(version uint16, suite *cipherSuite) func(result, secret, labe return prf } -// masterFromPreMasterSecret generates the master secret from the pre-master +// mainFromPreMainSecret generates the main secret from the pre-main // secret. See http://tools.ietf.org/html/rfc5246#section-8.1 -func masterFromPreMasterSecret(version uint16, suite *cipherSuite, preMasterSecret, clientRandom, serverRandom []byte) []byte { +func mainFromPreMainSecret(version uint16, suite *cipherSuite, preMainSecret, clientRandom, serverRandom []byte) []byte { seed := make([]byte, 0, len(clientRandom)+len(serverRandom)) seed = append(seed, clientRandom...) seed = append(seed, serverRandom...) - masterSecret := make([]byte, masterSecretLength) - prfForVersion(version, suite)(masterSecret, preMasterSecret, masterSecretLabel, seed) - return masterSecret + mainSecret := make([]byte, mainSecretLength) + prfForVersion(version, suite)(mainSecret, preMainSecret, mainSecretLabel, seed) + return mainSecret } -// keysFromMasterSecret generates the connection keys from the master +// keysFromMainSecret generates the connection keys from the main // secret, given the lengths of the MAC key, cipher key and IV, as defined in // RFC 2246, section 6.3. -func keysFromMasterSecret(version uint16, suite *cipherSuite, masterSecret, clientRandom, serverRandom []byte, macLen, keyLen, ivLen int) (clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV []byte) { +func keysFromMainSecret(version uint16, suite *cipherSuite, mainSecret, clientRandom, serverRandom []byte, macLen, keyLen, ivLen int) (clientMAC, serverMAC, clientKey, serverKey, clientIV, serverIV []byte) { seed := make([]byte, 0, len(serverRandom)+len(clientRandom)) seed = append(seed, serverRandom...) seed = append(seed, clientRandom...) n := 2*macLen + 2*keyLen + 2*ivLen keyMaterial := make([]byte, n) - prfForVersion(version, suite)(keyMaterial, masterSecret, keyExpansionLabel, seed) + prfForVersion(version, suite)(keyMaterial, mainSecret, keyExpansionLabel, seed) clientMAC = keyMaterial[:macLen] keyMaterial = keyMaterial[macLen:] serverMAC = keyMaterial[:macLen] @@ -254,25 +254,25 @@ func (h finishedHash) Sum() []byte { // finishedSum30 calculates the contents of the verify_data member of a SSLv3 // Finished message given the MD5 and SHA1 hashes of a set of handshake // messages. -func finishedSum30(md5, sha1 hash.Hash, masterSecret []byte, magic []byte) []byte { +func finishedSum30(md5, sha1 hash.Hash, mainSecret []byte, magic []byte) []byte { md5.Write(magic) - md5.Write(masterSecret) + md5.Write(mainSecret) md5.Write(ssl30Pad1[:]) md5Digest := md5.Sum(nil) md5.Reset() - md5.Write(masterSecret) + md5.Write(mainSecret) md5.Write(ssl30Pad2[:]) md5.Write(md5Digest) md5Digest = md5.Sum(nil) sha1.Write(magic) - sha1.Write(masterSecret) + sha1.Write(mainSecret) sha1.Write(ssl30Pad1[:40]) sha1Digest := sha1.Sum(nil) sha1.Reset() - sha1.Write(masterSecret) + sha1.Write(mainSecret) sha1.Write(ssl30Pad2[:40]) sha1.Write(sha1Digest) sha1Digest = sha1.Sum(nil) @@ -288,25 +288,25 @@ var ssl3ServerFinishedMagic = [4]byte{0x53, 0x52, 0x56, 0x52} // clientSum returns the contents of the verify_data member of a client's // Finished message. -func (h finishedHash) clientSum(masterSecret []byte) []byte { +func (h finishedHash) clientSum(mainSecret []byte) []byte { if h.version == VersionSSL30 { - return finishedSum30(h.clientMD5, h.client, masterSecret, ssl3ClientFinishedMagic[:]) + return finishedSum30(h.clientMD5, h.client, mainSecret, ssl3ClientFinishedMagic[:]) } out := make([]byte, finishedVerifyLength) - h.prf(out, masterSecret, clientFinishedLabel, h.Sum()) + h.prf(out, mainSecret, clientFinishedLabel, h.Sum()) return out } // serverSum returns the contents of the verify_data member of a server's // Finished message. -func (h finishedHash) serverSum(masterSecret []byte) []byte { +func (h finishedHash) serverSum(mainSecret []byte) []byte { if h.version == VersionSSL30 { - return finishedSum30(h.serverMD5, h.server, masterSecret, ssl3ServerFinishedMagic[:]) + return finishedSum30(h.serverMD5, h.server, mainSecret, ssl3ServerFinishedMagic[:]) } out := make([]byte, finishedVerifyLength) - h.prf(out, masterSecret, serverFinishedLabel, h.Sum()) + h.prf(out, mainSecret, serverFinishedLabel, h.Sum()) return out } @@ -328,7 +328,7 @@ func (h finishedHash) selectClientCertSignatureAlgorithm(serverList []signatureA // hashForClientCertificate returns a digest, hash function, and TLS 1.2 hash // id suitable for signing by a TLS client certificate. -func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash, masterSecret []byte) ([]byte, crypto.Hash, error) { +func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash, mainSecret []byte) ([]byte, crypto.Hash, error) { if (h.version == VersionSSL30 || h.version >= VersionTLS12) && h.buffer == nil { panic("a handshake hash for a client-certificate was requested after discarding the handshake buffer") } @@ -342,7 +342,7 @@ func (h finishedHash) hashForClientCertificate(signatureAndHash signatureAndHash md5Hash.Write(h.buffer) sha1Hash := sha1.New() sha1Hash.Write(h.buffer) - return finishedSum30(md5Hash, sha1Hash, masterSecret, nil), crypto.MD5SHA1, nil + return finishedSum30(md5Hash, sha1Hash, mainSecret, nil), crypto.MD5SHA1, nil } if h.version >= VersionTLS12 { hashAlg, err := lookupTLSHash(signatureAndHash.hash) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf_test.go index 0a1b1bcb..accbb327 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/prf_test.go @@ -9,11 +9,11 @@ import ( "testing" ) -type testSplitPreMasterSecretTest struct { +type testSplitPreMainSecretTest struct { in, out1, out2 string } -var testSplitPreMasterSecretTests = []testSplitPreMasterSecretTest{ +var testSplitPreMainSecretTests = []testSplitPreMainSecretTest{ {"", "", ""}, {"00", "00", "00"}, {"0011", "00", "11"}, @@ -21,10 +21,10 @@ var testSplitPreMasterSecretTests = []testSplitPreMasterSecretTest{ {"00112233", "0011", "2233"}, } -func TestSplitPreMasterSecret(t *testing.T) { - for i, test := range testSplitPreMasterSecretTests { +func TestSplitPreMainSecret(t *testing.T) { + for i, test := range testSplitPreMainSecretTests { in, _ := hex.DecodeString(test.in) - out1, out2 := splitPreMasterSecret(in) + out1, out2 := splitPreMainSecret(in) s1 := hex.EncodeToString(out1) s2 := hex.EncodeToString(out2) if s1 != test.out1 || s2 != test.out2 { @@ -36,27 +36,27 @@ func TestSplitPreMasterSecret(t *testing.T) { type testKeysFromTest struct { version uint16 suite *cipherSuite - preMasterSecret string + preMainSecret string clientRandom, serverRandom string - masterSecret string + mainSecret string clientMAC, serverMAC string clientKey, serverKey string macLen, keyLen int } -func TestKeysFromPreMasterSecret(t *testing.T) { +func TestKeysFromPreMainSecret(t *testing.T) { for i, test := range testKeysFromTests { - in, _ := hex.DecodeString(test.preMasterSecret) + in, _ := hex.DecodeString(test.preMainSecret) clientRandom, _ := hex.DecodeString(test.clientRandom) serverRandom, _ := hex.DecodeString(test.serverRandom) - masterSecret := masterFromPreMasterSecret(test.version, test.suite, in, clientRandom, serverRandom) - if s := hex.EncodeToString(masterSecret); s != test.masterSecret { - t.Errorf("#%d: bad master secret %s, want %s", i, s, test.masterSecret) + mainSecret := mainFromPreMainSecret(test.version, test.suite, in, clientRandom, serverRandom) + if s := hex.EncodeToString(mainSecret); s != test.mainSecret { + t.Errorf("#%d: bad main secret %s, want %s", i, s, test.mainSecret) continue } - clientMAC, serverMAC, clientKey, serverKey, _, _ := keysFromMasterSecret(test.version, test.suite, masterSecret, clientRandom, serverRandom, test.macLen, test.keyLen, 0) + clientMAC, serverMAC, clientKey, serverKey, _, _ := keysFromMainSecret(test.version, test.suite, mainSecret, clientRandom, serverRandom, test.macLen, test.keyLen, 0) clientMACString := hex.EncodeToString(clientMAC) serverMACString := hex.EncodeToString(serverMAC) clientKeyString := hex.EncodeToString(clientKey) diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/ticket.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/ticket.go index 3e7aa93c..2216dba2 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/ticket.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/crypto/tls/ticket.go @@ -20,7 +20,7 @@ import ( type sessionState struct { vers uint16 cipherSuite uint16 - masterSecret []byte + mainSecret []byte certificates [][]byte // usedOldKey is true if the ticket from which this session came from // was encrypted with an older key and thus should be refreshed. @@ -35,7 +35,7 @@ func (s *sessionState) equal(i interface{}) bool { if s.vers != s1.vers || s.cipherSuite != s1.cipherSuite || - !bytes.Equal(s.masterSecret, s1.masterSecret) { + !bytes.Equal(s.mainSecret, s1.mainSecret) { return false } @@ -53,7 +53,7 @@ func (s *sessionState) equal(i interface{}) bool { } func (s *sessionState) marshal() []byte { - length := 2 + 2 + 2 + len(s.masterSecret) + 2 + length := 2 + 2 + 2 + len(s.mainSecret) + 2 for _, cert := range s.certificates { length += 4 + len(cert) } @@ -64,11 +64,11 @@ func (s *sessionState) marshal() []byte { x[1] = byte(s.vers) x[2] = byte(s.cipherSuite >> 8) x[3] = byte(s.cipherSuite) - x[4] = byte(len(s.masterSecret) >> 8) - x[5] = byte(len(s.masterSecret)) + x[4] = byte(len(s.mainSecret) >> 8) + x[5] = byte(len(s.mainSecret)) x = x[6:] - copy(x, s.masterSecret) - x = x[len(s.masterSecret):] + copy(x, s.mainSecret) + x = x[len(s.mainSecret):] x[0] = byte(len(s.certificates) >> 8) x[1] = byte(len(s.certificates)) @@ -93,14 +93,14 @@ func (s *sessionState) unmarshal(data []byte) bool { s.vers = uint16(data[0])<<8 | uint16(data[1]) s.cipherSuite = uint16(data[2])<<8 | uint16(data[3]) - masterSecretLen := int(data[4])<<8 | int(data[5]) + mainSecretLen := int(data[4])<<8 | int(data[5]) data = data[6:] - if len(data) < masterSecretLen { + if len(data) < mainSecretLen { return false } - s.masterSecret = data[:masterSecretLen] - data = data[masterSecretLen:] + s.mainSecret = data[:mainSecretLen] + data = data[mainSecretLen:] if len(data) < 2 { return false diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/html/template/example_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/html/template/example_test.go index 3fc98205..037fd8a6 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/html/template/example_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/html/template/example_test.go @@ -127,22 +127,22 @@ func Example_escape() { func ExampleTemplate_block() { const ( - master = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` + main = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` overlay = `{{define "list"}} {{join . ", "}}{{end}} ` ) var ( funcs = template.FuncMap{"join": strings.Join} guardians = []string{"Gamora", "Groot", "Nebula", "Rocket", "Star-Lord"} ) - masterTmpl, err := template.New("master").Funcs(funcs).Parse(master) + mainTmpl, err := template.New("main").Funcs(funcs).Parse(main) if err != nil { log.Fatal(err) } - overlayTmpl, err := template.Must(masterTmpl.Clone()).Parse(overlay) + overlayTmpl, err := template.Must(mainTmpl.Clone()).Parse(overlay) if err != nil { log.Fatal(err) } - if err := masterTmpl.Execute(os.Stdout, guardians); err != nil { + if err := mainTmpl.Execute(os.Stdout, guardians); err != nil { log.Fatal(err) } if err := overlayTmpl.Execute(os.Stdout, guardians); err != nil { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/internal/syscall/unix/getentropy_openbsd.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/internal/syscall/unix/getentropy_openbsd.go index d5caa809..04db5e1f 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/internal/syscall/unix/getentropy_openbsd.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/internal/syscall/unix/getentropy_openbsd.go @@ -9,7 +9,7 @@ import ( "unsafe" ) -// getentropy(2)'s syscall number, from /usr/src/sys/kern/syscalls.master +// getentropy(2)'s syscall number, from /usr/src/sys/kern/syscalls.main const entropyTrap uintptr = 7 // GetEntropy calls the OpenBSD getentropy system call. diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/mail/message_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/mail/message_test.go index 2106a0b9..c901ed4f 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/mail/message_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/mail/message_test.go @@ -627,7 +627,7 @@ func TestAddressParsingAndFormatting(t *testing.T) { `<"dot.and space"@example.com>`, `<"very.unusual.@.unusual.com"@example.com>`, ``, - ``, + ``, "<#!$%&'*+-/=?^_`{}|~@example.org>", `<"very.(),:;<>[]\".VERY.\"very@\\ \"very\".unusual"@strange.example.com>`, // escaped quotes `<"()<>[]:,;@\\\"!#$%&'*+-/=?^_{}| ~.a"@example.org>`, // escaped backslashes diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/url/url_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/url/url_test.go index 5d974120..297cee7a 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/url/url_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/net/url/url_test.go @@ -56,10 +56,10 @@ var urltests = []URLTest{ }, // user { - "ftp://webmaster@www.google.com/", + "ftp://webmain@www.google.com/", &URL{ Scheme: "ftp", - User: User("webmaster"), + User: User("webmain"), Host: "www.google.com", Path: "/", }, @@ -153,19 +153,19 @@ var urltests = []URLTest{ }, // non-authority with path { - "mailto:/webmaster@golang.org", + "mailto:/webmain@golang.org", &URL{ Scheme: "mailto", - Path: "/webmaster@golang.org", + Path: "/webmain@golang.org", }, - "mailto:///webmaster@golang.org", // unfortunate compromise + "mailto:///webmain@golang.org", // unfortunate compromise }, // non-authority { - "mailto:webmaster@golang.org", + "mailto:webmain@golang.org", &URL{ Scheme: "mailto", - Opaque: "webmaster@golang.org", + Opaque: "webmain@golang.org", }, "", }, @@ -293,12 +293,12 @@ var urltests = []URLTest{ }, // case-insensitive scheme { - "MaIlTo:webmaster@golang.org", + "MaIlTo:webmain@golang.org", &URL{ Scheme: "mailto", - Opaque: "webmaster@golang.org", + Opaque: "webmain@golang.org", }, - "mailto:webmaster@golang.org", + "mailto:webmain@golang.org", }, // Relative path { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/example_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/example_test.go index 9cab2e83..3e328f49 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/example_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/example_test.go @@ -78,22 +78,22 @@ Josie func ExampleTemplate_block() { const ( - master = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` + main = `Names:{{block "list" .}}{{"\n"}}{{range .}}{{println "-" .}}{{end}}{{end}}` overlay = `{{define "list"}} {{join . ", "}}{{end}} ` ) var ( funcs = template.FuncMap{"join": strings.Join} guardians = []string{"Gamora", "Groot", "Nebula", "Rocket", "Star-Lord"} ) - masterTmpl, err := template.New("master").Funcs(funcs).Parse(master) + mainTmpl, err := template.New("main").Funcs(funcs).Parse(main) if err != nil { log.Fatal(err) } - overlayTmpl, err := template.Must(masterTmpl.Clone()).Parse(overlay) + overlayTmpl, err := template.Must(mainTmpl.Clone()).Parse(overlay) if err != nil { log.Fatal(err) } - if err := masterTmpl.Execute(os.Stdout, guardians); err != nil { + if err := mainTmpl.Execute(os.Stdout, guardians); err != nil { log.Fatal(err) } if err := overlayTmpl.Execute(os.Stdout, guardians); err != nil { diff --git a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/multi_test.go b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/multi_test.go index 5d8c08f0..2712ea45 100644 --- a/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/multi_test.go +++ b/google-cloud-sdk/platform/google_appengine/goroot-1.9/src/text/template/multi_test.go @@ -260,14 +260,14 @@ func TestAddParseTree(t *testing.T) { // Issue 7032 func TestAddParseTreeToUnparsedTemplate(t *testing.T) { - master := "{{define \"master\"}}{{end}}" - tmpl := New("master") - tree, err := parse.Parse("master", master, "", "", nil) + main := "{{define \"main\"}}{{end}}" + tmpl := New("main") + tree, err := parse.Parse("main", main, "", "", nil) if err != nil { t.Fatalf("unexpected parse err: %v", err) } - masterTree := tree["master"] - tmpl.AddParseTree("master", masterTree) // used to panic + mainTree := tree["main"] + tmpl.AddParseTree("main", mainTree) // used to panic } func TestRedefinition(t *testing.T) { diff --git a/google-cloud-sdk/platform/google_appengine/lib/argparse/doc/source/conf.py b/google-cloud-sdk/platform/google_appengine/lib/argparse/doc/source/conf.py index f3217cbc..8bac5a16 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/argparse/doc/source/conf.py +++ b/google-cloud-sdk/platform/google_appengine/lib/argparse/doc/source/conf.py @@ -36,8 +36,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'argparse' diff --git a/google-cloud-sdk/platform/google_appengine/lib/distutils/distutils/command/install.py b/google-cloud-sdk/platform/google_appengine/lib/distutils/distutils/command/install.py index b9f1c6c5..3484df03 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/distutils/distutils/command/install.py +++ b/google-cloud-sdk/platform/google_appengine/lib/distutils/distutils/command/install.py @@ -239,7 +239,7 @@ def initialize_options (self): def finalize_options (self): - # This method (and its pliant slaves, like 'finalize_unix()', + # This method (and its pliant subordinates, like 'finalize_unix()', # 'finalize_other()', and 'select_scheme()') is where the default # installation directories for modules, extension modules, and # anything else we care to install from a Python module diff --git a/google-cloud-sdk/platform/google_appengine/lib/grizzled/grizzled/db/sqlite.py b/google-cloud-sdk/platform/google_appengine/lib/grizzled/grizzled/db/sqlite.py index 5b651d3d..fd99751e 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/grizzled/grizzled/db/sqlite.py +++ b/google-cloud-sdk/platform/google_appengine/lib/grizzled/grizzled/db/sqlite.py @@ -49,7 +49,7 @@ def get_rdbms_metadata(self, cursor): return RDBMSMetadata('SQLite', 'SQLite 3', sqlite3.sqlite_version) def get_tables(self, cursor): - cursor.execute("select name from sqlite_master where type = 'table'") + cursor.execute("select name from sqlite_main where type = 'table'") table_names = [] rs = cursor.fetchone() while rs is not None: diff --git a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/docs/conf.py b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/docs/conf.py index 6e990be1..2cf4519a 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/docs/conf.py +++ b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/docs/conf.py @@ -31,8 +31,8 @@ # The suffix of source filenames. source_suffix = '.rst' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General substitutions. project = 'Jinja2' diff --git a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/examples/basic/test.py b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/examples/basic/test.py index b62c84fb..e707e410 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/examples/basic/test.py +++ b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/examples/basic/test.py @@ -3,7 +3,7 @@ env = Environment(loader=DictLoader({ 'child.html': u'''\ -{% extends master_layout or 'master.html' %} +{% extends main_layout or 'main.html' %} {% include helpers = 'helpers.html' %} {% macro get_the_answer() %}42{% endmacro %} {% title = 'Hello World' %} @@ -12,7 +12,7 @@ {{ helpers.conspirate() }} {% endblock %} ''', -'master.html': u'''\ +'main.html': u'''\ {{ title }} {% block body %}{% endblock %} diff --git a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/ext.py b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/ext.py index 6ca6c228..adbf6051 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/ext.py +++ b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/ext.py @@ -32,9 +32,9 @@ i18n_templates = { - 'master.html': '{{ page_title|default(_("missing")) }}' + 'main.html': '{{ page_title|default(_("missing")) }}' '{% block body %}{% endblock %}', - 'child.html': '{% extends "master.html" %}{% block body %}' + 'child.html': '{% extends "main.html" %}{% block body %}' '{% trans %}watch out{% endtrans %}{% endblock %}', 'plural.html': '{% trans user_count %}One user online{% pluralize %}' '{{ user_count }} users online{% endtrans %}', @@ -42,9 +42,9 @@ } newstyle_i18n_templates = { - 'master.html': '{{ page_title|default(_("missing")) }}' + 'main.html': '{{ page_title|default(_("missing")) }}' '{% block body %}{% endblock %}', - 'child.html': '{% extends "master.html" %}{% block body %}' + 'child.html': '{% extends "main.html" %}{% block body %}' '{% trans %}watch out{% endtrans %}{% endblock %}', 'plural.html': '{% trans user_count %}One user online{% pluralize %}' '{{ user_count }} users online{% endtrans %}', diff --git a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/inheritance.py b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/inheritance.py index 355aa0c9..63de798d 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/inheritance.py +++ b/google-cloud-sdk/platform/google_appengine/lib/jinja2-2.6/jinja2/testsuite/inheritance.py @@ -121,41 +121,41 @@ def test_preserve_blocks(self): def test_dynamic_inheritance(self): env = Environment(loader=DictLoader({ - 'master1': 'MASTER1{% block x %}{% endblock %}', - 'master2': 'MASTER2{% block x %}{% endblock %}', - 'child': '{% extends master %}{% block x %}CHILD{% endblock %}' + 'main1': 'MASTER1{% block x %}{% endblock %}', + 'main2': 'MASTER2{% block x %}{% endblock %}', + 'child': '{% extends main %}{% block x %}CHILD{% endblock %}' })) tmpl = env.get_template('child') for m in range(1, 3): - assert tmpl.render(master='master%d' % m) == 'MASTER%dCHILD' % m + assert tmpl.render(main='main%d' % m) == 'MASTER%dCHILD' % m def test_multi_inheritance(self): env = Environment(loader=DictLoader({ - 'master1': 'MASTER1{% block x %}{% endblock %}', - 'master2': 'MASTER2{% block x %}{% endblock %}', - 'child': '''{% if master %}{% extends master %}{% else %}{% extends - 'master1' %}{% endif %}{% block x %}CHILD{% endblock %}''' + 'main1': 'MASTER1{% block x %}{% endblock %}', + 'main2': 'MASTER2{% block x %}{% endblock %}', + 'child': '''{% if main %}{% extends main %}{% else %}{% extends + 'main1' %}{% endif %}{% block x %}CHILD{% endblock %}''' })) tmpl = env.get_template('child') - assert tmpl.render(master='master2') == 'MASTER2CHILD' - assert tmpl.render(master='master1') == 'MASTER1CHILD' + assert tmpl.render(main='main2') == 'MASTER2CHILD' + assert tmpl.render(main='main1') == 'MASTER1CHILD' assert tmpl.render() == 'MASTER1CHILD' def test_scoped_block(self): env = Environment(loader=DictLoader({ - 'master.html': '{% for item in seq %}[{% block item scoped %}' + 'main.html': '{% for item in seq %}[{% block item scoped %}' '{% endblock %}]{% endfor %}' })) - t = env.from_string('{% extends "master.html" %}{% block item %}' + t = env.from_string('{% extends "main.html" %}{% block item %}' '{{ item }}{% endblock %}') assert t.render(seq=range(5)) == '[0][1][2][3][4]' def test_super_in_scoped_block(self): env = Environment(loader=DictLoader({ - 'master.html': '{% for item in seq %}[{% block item scoped %}' + 'main.html': '{% for item in seq %}[{% block item scoped %}' '{{ item }}{% endblock %}]{% endfor %}' })) - t = env.from_string('{% extends "master.html" %}{% block item %}' + t = env.from_string('{% extends "main.html" %}{% block item %}' '{{ super() }}|{{ item * 2 }}{% endblock %}') assert t.render(seq=range(5)) == '[0|0][1|2][2|4][3|6][4|8]' diff --git a/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/pkg_resources.py b/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/pkg_resources.py index 79db00b8..33902b75 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/pkg_resources.py +++ b/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/pkg_resources.py @@ -2590,7 +2590,7 @@ def _initialize(g): g[name] = getattr(_manager, name) _initialize(globals()) -# Prepare the master working set and make the ``require()`` API available +# Prepare the main working set and make the ``require()`` API available _declare_state('object', working_set = WorkingSet()) try: # Does the main program list any requirements? diff --git a/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/setuptools/tests/doctest.py b/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/setuptools/tests/doctest.py index bffce58f..e4ac8b90 100644 --- a/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/setuptools/tests/doctest.py +++ b/google-cloud-sdk/platform/google_appengine/lib/setuptools-0.6c11/setuptools/tests/doctest.py @@ -1452,7 +1452,7 @@ def summarize(self, verbose=None): return totalf, totalt #///////////////////////////////////////////////////////////////// - # Backward compatibility cruft to maintain doctest.master. + # Backward compatibility cruft to maintain doctest.main. #///////////////////////////////////////////////////////////////// def merge(self, other): d = self._name2ft @@ -1746,7 +1746,7 @@ def report_failure(self, out, test, example, got): # For backward compatibility, a global instance of a DocTestRunner # class, updated by testmod. -master = None +main = None def testmod(m=None, name=None, globs=None, verbose=None, isprivate=None, report=True, optionflags=0, extraglobs=None, @@ -1815,13 +1815,13 @@ def testmod(m=None, name=None, globs=None, verbose=None, isprivate=None, Advanced tomfoolery: testmod runs methods of a local instance of class doctest.Tester, then merges the results into (or creates) - global Tester instance doctest.master. Methods of doctest.master + global Tester instance doctest.main. Methods of doctest.main can be called directly too, if you want to do something unusual. Passing report=0 to testmod is especially useful then, to delay - displaying a summary. Invoke doctest.master.summarize(verbose) + displaying a summary. Invoke doctest.main.summarize(verbose) when you're done fiddling. """ - global master + global main if isprivate is not None: warnings.warn("the isprivate argument is deprecated; " @@ -1857,10 +1857,10 @@ class doctest.Tester, then merges the results into (or creates) if report: runner.summarize() - if master is None: - master = runner + if main is None: + main = runner else: - master.merge(runner) + main.merge(runner) return runner.failures, runner.tries @@ -1933,13 +1933,13 @@ def testfile(filename, module_relative=True, name=None, package=None, Advanced tomfoolery: testmod runs methods of a local instance of class doctest.Tester, then merges the results into (or creates) - global Tester instance doctest.master. Methods of doctest.master + global Tester instance doctest.main. Methods of doctest.main can be called directly too, if you want to do something unusual. Passing report=0 to testmod is especially useful then, to delay - displaying a summary. Invoke doctest.master.summarize(verbose) + displaying a summary. Invoke doctest.main.summarize(verbose) when you're done fiddling. """ - global master + global main if package and not module_relative: raise ValueError("Package may only be specified for module-" @@ -1975,10 +1975,10 @@ class doctest.Tester, then merges the results into (or creates) if report: runner.summarize() - if master is None: - master = runner + if main is None: + main = runner else: - master.merge(runner) + main.merge(runner) return runner.failures, runner.tries diff --git a/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py b/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py index 8f278cd8..9b109219 100644 --- a/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py +++ b/google-cloud-sdk/platform/gsutil/gslib/addlhelp/naming.py @@ -94,8 +94,8 @@ user who creates the bucket, so the user who creates the bucket must also be verified as an owner or manager of the domain. - To verify as the owner or manager of a domain, use the Google Webmaster - Tools verification process. The Webmaster Tools verification process + To verify as the owner or manager of a domain, use the Google Webmain + Tools verification process. The Webmain Tools verification process provides three methods for verifying an owner or manager of a domain: 1. Adding a special Meta tag to a site's homepage. diff --git a/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py b/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py index a5d9def5..ab2fd552 100644 --- a/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py +++ b/google-cloud-sdk/platform/gsutil/gslib/commands/notification.py @@ -334,7 +334,7 @@ Service Account authentication and that the Service Account's project is authorized for the application URL. Notification endpoint URLs must also be whitelisted in your Cloud Console project. To do that, the domain must also be -verified using Google Webmaster Tools. For instructions, please see +verified using Google Webmain Tools. For instructions, please see `Notification Authorization `_. """ diff --git a/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py b/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py index f09987b9..5f14a276 100644 --- a/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py +++ b/google-cloud-sdk/platform/gsutil/gslib/ui_controller.py @@ -1048,7 +1048,7 @@ def Call(self, status_message, stream, cur_time=None): class MainThreadUIQueue(object): - """Handles status display and processing in the main thread / master process. + """Handles status display and processing in the main thread / main process. This class emulates a queue to cover main-thread activity before or after Apply, as well as for the single-threaded, single-process case, i.e., diff --git a/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py b/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py index f925ccfe..c1c2001d 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py +++ b/google-cloud-sdk/platform/gsutil/third_party/apitools/apitools/base/py/batch.py @@ -176,7 +176,7 @@ def Add(self, service, method, request, global_params=None): method_config, request, global_params=global_params, upload_config=upload_config) - # Create the request and add it to our master list. + # Create the request and add it to our main list. api_request = self.ApiCall( http_request, self.retryable_codes, service, method_config) self.api_requests.append(api_request) diff --git a/google-cloud-sdk/platform/gsutil/third_party/apitools/run_pylint.py b/google-cloud-sdk/platform/gsutil/third_party/apitools/run_pylint.py index c7e532ec..af55c21e 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/apitools/run_pylint.py +++ b/google-cloud-sdk/platform/gsutil/third_party/apitools/run_pylint.py @@ -118,9 +118,9 @@ def get_files_for_linting(allow_limited=True, diff_base=None): uses a specific commit or branch (a so-called diff base) to compare against for changed files. (This requires ``allow_limited=True``.) - To speed up linting on Travis pull requests against master, we manually - set the diff base to origin/master. We don't do this on non-pull requests - since origin/master will be equivalent to the currently checked out code. + To speed up linting on Travis pull requests against main, we manually + set the diff base to origin/main. We don't do this on non-pull requests + since origin/main will be equivalent to the currently checked out code. One could potentially use ${TRAVIS_COMMIT_RANGE} to find a diff base but this value is not dependable. @@ -133,14 +133,14 @@ def get_files_for_linting(allow_limited=True, diff_base=None): linted. """ if os.getenv('TRAVIS') == 'true': - # In travis, don't default to master. + # In travis, don't default to main. diff_base = None - if (os.getenv('TRAVIS_BRANCH') == 'master' and + if (os.getenv('TRAVIS_BRANCH') == 'main' and os.getenv('TRAVIS_PULL_REQUEST') != 'false'): - # In the case of a pull request into master, we want to - # diff against HEAD in master. - diff_base = 'origin/master' + # In the case of a pull request into main, we want to + # diff against HEAD in main. + diff_base = 'origin/main' if diff_base is not None and allow_limited: result = subprocess.check_output(['git', 'diff', '--name-only', diff --git a/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py index ea2ca4a3..67d2bf72 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/argcomplete/docs/conf.py @@ -36,8 +36,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'argcomplete' diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py index 0f4dc9c7..3a5ce45e 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/elastictranscoder/layer1.py @@ -118,10 +118,10 @@ def create_job(self, pipeline_id=None, input_name=None, output=None, :type playlists: list :param playlists: If you specify a preset in `PresetId` for which the value of `Container` is ts (MPEG-TS), Playlists contains - information about the master playlists that you want Elastic + information about the main playlists that you want Elastic Transcoder to create. - We recommend that you create only one master playlist. The maximum - number of master playlists in a job is 30. + We recommend that you create only one main playlist. The maximum + number of main playlists in a job is 30. """ uri = '/2012-09-25/jobs' diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py index 7afc4e07..870a9bdc 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/connection.py @@ -408,8 +408,8 @@ def modify_instance_groups(self, instance_group_ids, new_sizes): def run_jobflow(self, name, log_uri=None, ec2_keyname=None, availability_zone=None, - master_instance_type='m1.small', - slave_instance_type='m1.small', num_instances=1, + main_instance_type='m1.small', + subordinate_instance_type='m1.small', num_instances=1, action_on_failure='TERMINATE_JOB_FLOW', keep_alive=False, enable_debugging=False, hadoop_version=None, @@ -436,11 +436,11 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, :type availability_zone: str :param availability_zone: EC2 availability zone of the cluster - :type master_instance_type: str - :param master_instance_type: EC2 instance type of the master + :type main_instance_type: str + :param main_instance_type: EC2 instance type of the main - :type slave_instance_type: str - :param slave_instance_type: EC2 instance type of the slave nodes + :type subordinate_instance_type: str + :param subordinate_instance_type: EC2 instance type of the subordinate nodes :type num_instances: int :param num_instances: Number of instances in the Hadoop cluster @@ -471,7 +471,7 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, :param instance_groups: Optional list of instance groups to use when creating this job. NB: When provided, this argument supersedes num_instances - and master/slave_instance_type. + and main/subordinate_instance_type. :type ami_version: str :param ami_version: Amazon Machine Image (AMI) version to use @@ -526,15 +526,15 @@ def run_jobflow(self, name, log_uri=None, ec2_keyname=None, params.update(common_params) # NB: according to the AWS API's error message, we must - # "configure instances either using instance count, master and - # slave instance type or instance groups but not both." + # "configure instances either using instance count, main and + # subordinate instance type or instance groups but not both." # # Thus we switch here on the truthiness of instance_groups. if not instance_groups: # Instance args (the common case) instance_params = self._build_instance_count_and_type_args( - master_instance_type, - slave_instance_type, + main_instance_type, + subordinate_instance_type, num_instances) params.update(instance_params) else: @@ -721,15 +721,15 @@ def _build_instance_common_args(self, ec2_keyname, availability_zone, return params - def _build_instance_count_and_type_args(self, master_instance_type, - slave_instance_type, num_instances): + def _build_instance_count_and_type_args(self, main_instance_type, + subordinate_instance_type, num_instances): """ - Takes a master instance type (string), a slave instance type + Takes a main instance type (string), a subordinate instance type (string), and a number of instances. Returns a comparable dict for use in making a RunJobFlow request. """ - params = {'Instances.MasterInstanceType': master_instance_type, - 'Instances.SlaveInstanceType': slave_instance_type, + params = {'Instances.MainInstanceType': main_instance_type, + 'Instances.SubordinateInstanceType': subordinate_instance_type, 'Instances.InstanceCount': num_instances} return params diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py index de6835fb..35cb8bbf 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/emr/step.py @@ -132,7 +132,7 @@ def __init__(self, name, mapper, reducer=None, combiner=None, :param output: The output uri :type jar: str :param jar: The hadoop streaming jar. This can be either a local - path on the master node, or an s3:// URI. + path on the main node, or an s3:// URI. """ self.name = name self.mapper = mapper diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py index 88ea2e0f..3fbc059d 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/kms/layer1.py @@ -130,7 +130,7 @@ def _required_auth_capability(self): def create_alias(self, alias_name, target_key_id): """ - Creates a display name for a customer master key. An alias can + Creates a display name for a customer main key. An alias can be used to identify a key and should be unique. The console enforces a one-to-one mapping between the alias and a key. An alias name can contain only alphanumeric characters, forward @@ -174,7 +174,7 @@ def create_grant(self, key_id, grantee_principal, #. RevokeGrant :type key_id: string - :param key_id: A unique key identifier for a customer master key. This + :param key_id: A unique key identifier for a customer main key. This value can be a globally unique identifier, an ARN, or an alias. :type grantee_principal: string @@ -222,7 +222,7 @@ def create_grant(self, key_id, grantee_principal, def create_key(self, policy=None, description=None, key_usage=None): """ - Creates a customer master key. Customer master keys can be + Creates a customer main key. Customer main keys can be used to encrypt small amounts of data (less than 4K) directly, but they are most commonly used to encrypt or envelope data keys that are then used to encrypt customer data. For more @@ -306,10 +306,10 @@ def delete_alias(self, alias_name): def describe_key(self, key_id): """ Provides detailed information about the specified customer - master key. + main key. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be described. This can be an ARN, an alias, or a globally unique identifier. @@ -323,7 +323,7 @@ def disable_key(self, key_id): Marks a key as disabled, thereby preventing its use. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be disabled. This can be an ARN, an alias, or a globally unique identifier. @@ -337,7 +337,7 @@ def disable_key_rotation(self, key_id): Disables rotation of the specified key. :type key_id: string - :param key_id: Unique identifier of the customer master key for which + :param key_id: Unique identifier of the customer main key for which rotation is to be disabled. This can be an ARN, an alias, or a globally unique identifier. @@ -352,7 +352,7 @@ def enable_key(self, key_id): have up to 25 enabled keys at one time. :type key_id: string - :param key_id: Unique identifier of the customer master key to be + :param key_id: Unique identifier of the customer main key to be enabled. This can be an ARN, an alias, or a globally unique identifier. @@ -363,10 +363,10 @@ def enable_key(self, key_id): def enable_key_rotation(self, key_id): """ - Enables rotation of the specified customer master key. + Enables rotation of the specified customer main key. :type key_id: string - :param key_id: Unique identifier of the customer master key for which + :param key_id: Unique identifier of the customer main key for which rotation is to be enabled. This can be an ARN, an alias, or a globally unique identifier. @@ -378,11 +378,11 @@ def enable_key_rotation(self, key_id): def encrypt(self, key_id, plaintext, encryption_context=None, grant_tokens=None): """ - Encrypts plaintext into ciphertext by using a customer master + Encrypts plaintext into ciphertext by using a customer main key. :type key_id: string - :param key_id: Unique identifier of the customer master. This can be an + :param key_id: Unique identifier of the customer main. This can be an ARN, an alias, or the Key ID. :type plaintext: blob @@ -420,7 +420,7 @@ def generate_data_key(self, key_id, encryption_context=None, grant_tokens=None): """ Generates a secure data key. Data keys are used to encrypt and - decrypt data. They are wrapped by customer master keys. + decrypt data. They are wrapped by customer main keys. :type key_id: string :param key_id: Unique identifier of the key. This can be an ARN, an @@ -472,7 +472,7 @@ def generate_data_key_without_plaintext(self, key_id, number_of_bytes=None, grant_tokens=None): """ - Returns a key wrapped by a customer master key without the + Returns a key wrapped by a customer main key without the plaintext copy of that key. To retrieve the plaintext, see GenerateDataKey. @@ -651,7 +651,7 @@ def list_key_policies(self, key_id, limit=None, marker=None): def list_keys(self, limit=None, marker=None): """ - Lists the customer master keys. + Lists the customer main keys. :type limit: integer :param limit: Specify this parameter only when paginating results to @@ -702,7 +702,7 @@ def re_encrypt(self, ciphertext_blob, destination_key_id, source_encryption_context=None, destination_encryption_context=None, grant_tokens=None): """ - Encrypts data on the server side with a new customer master + Encrypts data on the server side with a new customer main key without exposing the plaintext of the data on the client side. The data is first decrypted and then encrypted. This operation can also be used to change the encryption context of diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py index 8894d1c3..e007856c 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/opsworks/layer1.py @@ -2124,7 +2124,7 @@ def register_rds_db_instance(self, stack_id, rds_db_instance_arn, :param rds_db_instance_arn: The Amazon RDS instance's ARN. :type db_user: string - :param db_user: The database's master user name. + :param db_user: The database's main user name. :type db_password: string :param db_password: The database password. @@ -2785,7 +2785,7 @@ def update_rds_db_instance(self, rds_db_instance_arn, db_user=None, :param rds_db_instance_arn: The Amazon RDS instance's ARN. :type db_user: string - :param db_user: The master user name. + :param db_user: The main user name. :type db_password: string :param db_password: The database password. diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py index 82c2822e..21fafd24 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/pyami/bootstrap.py @@ -88,7 +88,7 @@ def load_boto(self): if update.find(':') >= 0: method, version = update.split(':') else: - version = 'master' + version = 'main' self.run('git checkout %s' % version, cwd=location) else: # first remove the symlink needed when running from subversion diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py index 9e9132c9..14ed7fa8 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/__init__.py @@ -138,8 +138,8 @@ def create_dbinstance(self, id, allocated_storage, instance_class, - master_username, - master_password, + main_username, + main_password, port=3306, engine='MySQL5.1', db_name=None, @@ -168,8 +168,8 @@ def create_dbinstance(self, # security_groups should be db_security_groups according to API docs but has been left # security_groups for backwards compatibility # - # master_password should be master_user_password according to API docs but has been left - # master_password for backwards compatibility + # main_password should be main_user_password according to API docs but has been left + # main_password for backwards compatibility # # instance_class should be db_instance_class according to API docs but has been left # instance_class for backwards compatibility @@ -222,8 +222,8 @@ def create_dbinstance(self, * sqlserver-web * postgres - :type master_username: str - :param master_username: Name of master user for the DBInstance. + :type main_username: str + :param main_username: Name of main user for the DBInstance. * MySQL must be; - 1--16 alphanumeric characters @@ -240,8 +240,8 @@ def create_dbinstance(self, - first character must be a letter - cannot be a reserver SQL Server word - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. * MySQL must be 8--41 alphanumeric characters @@ -398,8 +398,8 @@ def create_dbinstance(self, # engine => Engine # engine_version => EngineVersion # license_model => LicenseModel - # master_username => MasterUsername - # master_user_password => MasterUserPassword + # main_username => MainUsername + # main_user_password => MainUserPassword # multi_az => MultiAZ # option_group_name => OptionGroupName # port => Port @@ -423,8 +423,8 @@ def create_dbinstance(self, 'EngineVersion': engine_version, 'Iops': iops, 'LicenseModel': license_model, - 'MasterUsername': master_username, - 'MasterUserPassword': master_password, + 'MainUsername': main_username, + 'MainUserPassword': main_password, 'MultiAZ': str(multi_az).lower() if multi_az else None, 'OptionGroupName': option_group_name, 'Port': port, @@ -562,7 +562,7 @@ def promote_read_replica(self, id, def modify_dbinstance(self, id, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -593,8 +593,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -680,8 +680,8 @@ def modify_dbinstance(self, id, param_group=None, security_groups=None, self.build_list_params(params, l, 'VpcSecurityGroupIds.member') if preferred_maintenance_window: params['PreferredMaintenanceWindow'] = preferred_maintenance_window - if master_password: - params['MasterUserPassword'] = master_password + if main_password: + params['MainUserPassword'] = main_password if allocated_storage: params['AllocatedStorage'] = allocated_storage if instance_class: diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py index 6a638510..e0acf277 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbinstance.py @@ -47,7 +47,7 @@ class DBInstance(object): in status "available". :ivar instance_class: Contains the name of the compute and memory capacity class of the DB Instance. - :ivar master_username: The username that is set as master username + :ivar main_username: The username that is set as main username at creation time. :ivar parameter_groups: Provides the list of DB Parameter Groups applied to this DB Instance. @@ -98,7 +98,7 @@ def __init__(self, connection=None, id=None): self.auto_minor_version_upgrade = None self.endpoint = None self.instance_class = None - self.master_username = None + self.main_username = None self.parameter_groups = [] self.security_groups = [] self.read_replica_dbinstance_identifiers = [] @@ -172,8 +172,8 @@ def endElement(self, name, value, connection): self.auto_minor_version_upgrade = value.lower() == 'true' elif name == 'DBInstanceClass': self.instance_class = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'Port': if self._in_endpoint: self._port = int(value) @@ -293,7 +293,7 @@ def stop(self, skip_final_snapshot=False, final_snapshot_id=''): def modify(self, param_group=None, security_groups=None, preferred_maintenance_window=None, - master_password=None, allocated_storage=None, + main_password=None, allocated_storage=None, instance_class=None, backup_retention_period=None, preferred_backup_window=None, @@ -318,8 +318,8 @@ def modify(self, param_group=None, security_groups=None, UTC) during which maintenance can occur. Default is Sun:05:00-Sun:09:00 - :type master_password: str - :param master_password: Password of master user for the DBInstance. + :type main_password: str + :param main_password: Password of main user for the DBInstance. Must be 4-15 alphanumeric characters. :type allocated_storage: int @@ -386,7 +386,7 @@ def modify(self, param_group=None, security_groups=None, param_group, security_groups, preferred_maintenance_window, - master_password, + main_password, allocated_storage, instance_class, backup_retention_period, diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py index 16d8125b..35ecbd52 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds/dbsnapshot.py @@ -34,10 +34,10 @@ class DBSnapshot(object): :ivar id: Specifies the identifier for the DB Snapshot (DBSnapshotIdentifier) :ivar instance_create_time: Specifies the time (UTC) when the snapshot was taken :ivar instance_id: Specifies the the DBInstanceIdentifier of the DB Instance this DB Snapshot was created from (DBInstanceIdentifier) - :ivar master_username: Provides the master username for the DB Instance + :ivar main_username: Provides the main username for the DB Instance :ivar port: Specifies the port that the database engine was listening on at the time of the snapshot :ivar snapshot_create_time: Provides the time (UTC) when the snapshot was taken - :ivar status: Specifies the status of this DB Snapshot. Possible values are [ available, backing-up, creating, deleted, deleting, failed, modifying, rebooting, resetting-master-credentials ] + :ivar status: Specifies the status of this DB Snapshot. Possible values are [ available, backing-up, creating, deleted, deleting, failed, modifying, rebooting, resetting-main-credentials ] :ivar iops: Specifies the Provisioned IOPS (I/O operations per second) value of the DB instance at the time of the snapshot. :ivar option_group_name: Provides the option group name for the DB snapshot. :ivar percent_progress: The percentage of the estimated data that has been transferred. @@ -56,7 +56,7 @@ def __init__(self, connection=None, id=None): self.port = None self.status = None self.availability_zone = None - self.master_username = None + self.main_username = None self.allocated_storage = None self.instance_id = None self.availability_zone = None @@ -93,8 +93,8 @@ def endElement(self, name, value, connection): self.status = value elif name == 'AvailabilityZone': self.availability_zone = value - elif name == 'MasterUsername': - self.master_username = value + elif name == 'MainUsername': + self.main_username = value elif name == 'AllocatedStorage': self.allocated_storage = int(value) elif name == 'SnapshotTime': diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py index bbe5a778..9ad772f8 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/rds2/layer1.py @@ -321,8 +321,8 @@ def copy_db_snapshot(self, source_db_snapshot_identifier, path='/', params=params) def create_db_instance(self, db_instance_identifier, allocated_storage, - db_instance_class, engine, master_username, - master_user_password, db_name=None, + db_instance_class, engine, main_username, + main_user_password, db_name=None, db_security_groups=None, vpc_security_group_ids=None, availability_zone=None, db_subnet_group_name=None, @@ -417,9 +417,9 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, Valid Values: `MySQL` | `oracle-se1` | `oracle-se` | `oracle-ee` | `sqlserver-ee` | `sqlserver-se` | `sqlserver-ex` | `sqlserver-web` - :type master_username: string - :param master_username: - The name of master user for the client DB instance. + :type main_username: string + :param main_username: + The name of main user for the client DB instance. **MySQL** @@ -452,8 +452,8 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, + First character must be a letter. + Cannot be a reserved word for the chosen database engine. - :type master_user_password: string - :param master_user_password: The password for the master database user. + :type main_user_password: string + :param main_user_password: The password for the main database user. Can be any printable ASCII character except "/", '"', or "@". Type: String @@ -536,7 +536,7 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, + Must be a value from 0 to 8 - + Cannot be set to 0 if the DB instance is a master instance with read + + Cannot be set to 0 if the DB instance is a main instance with read replicas :type preferred_backup_window: string @@ -656,8 +656,8 @@ def create_db_instance(self, db_instance_identifier, allocated_storage, 'AllocatedStorage': allocated_storage, 'DBInstanceClass': db_instance_class, 'Engine': engine, - 'MasterUsername': master_username, - 'MasterUserPassword': master_user_password, + 'MainUsername': main_username, + 'MainUserPassword': main_user_password, } if db_name is not None: params['DBName'] = db_name @@ -2488,7 +2488,7 @@ def modify_db_instance(self, db_instance_identifier, allocated_storage=None, db_instance_class=None, db_security_groups=None, vpc_security_group_ids=None, - apply_immediately=None, master_user_password=None, + apply_immediately=None, main_user_password=None, db_parameter_group_name=None, backup_retention_period=None, preferred_backup_window=None, @@ -2616,14 +2616,14 @@ def modify_db_instance(self, db_instance_identifier, Default: `False` - :type master_user_password: string - :param master_user_password: - The new password for the DB instance master user. Can be any printable + :type main_user_password: string + :param main_user_password: + The new password for the DB instance main user. Can be any printable ASCII character except "/", '"', or "@". Changing this parameter does not result in an outage and the change is asynchronously applied as soon as possible. Between the time of the - request and the completion of the request, the `MasterUserPassword` + request and the completion of the request, the `MainUserPassword` element exists in the `PendingModifiedValues` element of the operation response. @@ -2634,7 +2634,7 @@ def modify_db_instance(self, db_instance_identifier, characters (SQL Server). Amazon RDS API actions never return the password, so this action - provides a way to regain access to a master instance user if the + provides a way to regain access to a main instance user if the password is lost. :type db_parameter_group_name: string @@ -2668,7 +2668,7 @@ def modify_db_instance(self, db_instance_identifier, + Must be a value from 0 to 8 - + Cannot be set to 0 if the DB instance is a master instance with read + + Cannot be set to 0 if the DB instance is a main instance with read replicas or if the DB instance is a read replica :type preferred_backup_window: string @@ -2820,8 +2820,8 @@ def modify_db_instance(self, db_instance_identifier, if apply_immediately is not None: params['ApplyImmediately'] = str( apply_immediately).lower() - if master_user_password is not None: - params['MasterUserPassword'] = master_user_password + if main_user_password is not None: + params['MainUserPassword'] = main_user_password if db_parameter_group_name is not None: params['DBParameterGroupName'] = db_parameter_group_name if backup_retention_period is not None: diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py index be1529fd..46390418 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/boto/redshift/layer1.py @@ -310,8 +310,8 @@ def copy_cluster_snapshot(self, source_snapshot_identifier, verb='POST', path='/', params=params) - def create_cluster(self, cluster_identifier, node_type, master_username, - master_user_password, db_name=None, cluster_type=None, + def create_cluster(self, cluster_identifier, node_type, main_username, + main_user_password, db_name=None, cluster_type=None, cluster_security_groups=None, vpc_security_group_ids=None, cluster_subnet_group_name=None, @@ -391,9 +391,9 @@ def create_cluster(self, cluster_identifier, node_type, master_username, Valid Values: `dw1.xlarge` | `dw1.8xlarge` | `dw2.large` | `dw2.8xlarge`. - :type master_username: string - :param master_username: - The user name associated with the master user account for the cluster + :type main_username: string + :param main_username: + The user name associated with the main user account for the cluster that is being created. Constraints: @@ -404,9 +404,9 @@ def create_cluster(self, cluster_identifier, node_type, master_username, + Cannot be a reserved word. A list of reserved words can be found in `Reserved Words`_ in the Amazon Redshift Database Developer Guide. - :type master_user_password: string - :param master_user_password: - The password associated with the master user account for the cluster + :type main_user_password: string + :param main_user_password: + The password associated with the main user account for the cluster that is being created. Constraints: @@ -573,8 +573,8 @@ def create_cluster(self, cluster_identifier, node_type, master_username, params = { 'ClusterIdentifier': cluster_identifier, 'NodeType': node_type, - 'MasterUsername': master_username, - 'MasterUserPassword': master_user_password, + 'MainUsername': main_username, + 'MainUserPassword': main_user_password, } if db_name is not None: params['DBName'] = db_name @@ -2253,7 +2253,7 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, node_type=None, number_of_nodes=None, cluster_security_groups=None, vpc_security_group_ids=None, - master_user_password=None, + main_user_password=None, cluster_parameter_group_name=None, automated_snapshot_retention_period=None, preferred_maintenance_window=None, @@ -2264,7 +2264,7 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, """ Modifies the settings for a cluster. For example, you can add another security or parameter group, update the preferred - maintenance window, or change the master user password. + maintenance window, or change the main user password. Resetting a cluster password or modifying the security groups associated with a cluster do not need a reboot. However, modifying a parameter group requires a reboot for parameters @@ -2345,11 +2345,11 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, :param vpc_security_group_ids: A list of virtual private cloud (VPC) security groups to be associated with the cluster. - :type master_user_password: string - :param master_user_password: - The new password for the cluster master user. This change is + :type main_user_password: string + :param main_user_password: + The new password for the cluster main user. This change is asynchronously applied as soon as possible. Between the time of the - request and the completion of the request, the `MasterUserPassword` + request and the completion of the request, the `MainUserPassword` element exists in the `PendingModifiedValues` element of the operation response. @@ -2464,8 +2464,8 @@ def modify_cluster(self, cluster_identifier, cluster_type=None, self.build_list_params(params, vpc_security_group_ids, 'VpcSecurityGroupIds.member') - if master_user_password is not None: - params['MasterUserPassword'] = master_user_password + if main_user_password is not None: + params['MainUserPassword'] = main_user_password if cluster_parameter_group_name is not None: params['ClusterParameterGroupName'] = cluster_parameter_group_name if automated_snapshot_retention_period is not None: diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py index 20963ed2..6d417e62 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds/test_promote_modify.py @@ -22,38 +22,38 @@ class PromoteReadReplicaTest(unittest.TestCase): def setUp(self): self.conn = RDSConnection() - self.masterDB_name = "boto-db-%s" % str(int(time.time())) - self.replicaDB_name = "replica-%s" % self.masterDB_name - self.renamedDB_name = "renamed-replica-%s" % self.masterDB_name + self.mainDB_name = "boto-db-%s" % str(int(time.time())) + self.replicaDB_name = "replica-%s" % self.mainDB_name + self.renamedDB_name = "renamed-replica-%s" % self.mainDB_name def tearDown(self): instances = self.conn.get_all_dbinstances() - for db in [self.masterDB_name, self.replicaDB_name, self.renamedDB_name]: + for db in [self.mainDB_name, self.replicaDB_name, self.renamedDB_name]: for i in instances: if i.id == db: self.conn.delete_dbinstance(db, skip_final_snapshot=True) def test_promote(self): print '--- running RDS promotion & renaming tests ---' - self.masterDB = self.conn.create_dbinstance(self.masterDB_name, 5, 'db.t1.micro', 'root', 'bototestpw') + self.mainDB = self.conn.create_dbinstance(self.mainDB_name, 5, 'db.t1.micro', 'root', 'bototestpw') - # Wait up to 15 minutes for the masterDB to become available - print '--- waiting for "%s" to become available ---' % self.masterDB_name + # Wait up to 15 minutes for the mainDB to become available + print '--- waiting for "%s" to become available ---' % self.mainDB_name wait_timeout = time.time() + (15 * 60) time.sleep(60) - instances = self.conn.get_all_dbinstances(self.masterDB_name) + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] while wait_timeout > time.time() and inst.status != 'available': time.sleep(15) - instances = self.conn.get_all_dbinstances(self.masterDB_name) + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] self.assertTrue(inst.status == 'available') - self.replicaDB = self.conn.create_dbinstance_read_replica(self.replicaDB_name, self.masterDB_name) + self.replicaDB = self.conn.create_dbinstance_read_replica(self.replicaDB_name, self.mainDB_name) # Wait up to 15 minutes for the replicaDB to become available print '--- waiting for "%s" to become available ---' % self.replicaDB_name @@ -92,8 +92,8 @@ def test_promote(self): self.assertTrue(inst.status == 'available') self.assertFalse(inst.status_infos) - # Verify that the master no longer has any read replicas - instances = self.conn.get_all_dbinstances(self.masterDB_name) + # Verify that the main no longer has any read replicas + instances = self.conn.get_all_dbinstances(self.mainDB_name) inst = instances[0] self.assertFalse(inst.read_replica_dbinstance_identifiers) @@ -101,7 +101,7 @@ def test_promote(self): self.renamedDB = self.conn.modify_dbinstance(self.replicaDB_name, new_instance_id=self.renamedDB_name, apply_immediately=True) - # Wait up to 15 minutes for the masterDB to become available + # Wait up to 15 minutes for the mainDB to become available print '--- waiting for "%s" to exist ---' % self.renamedDB_name wait_timeout = time.time() + (15 * 60) diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py index 82d8193b..7830636d 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/rds2/test_connection.py @@ -44,8 +44,8 @@ def test_integration(self): allocated_storage=5, db_instance_class='db.t1.micro', engine='postgres', - master_username='bototestuser', - master_user_password='testtestt3st', + main_username='bototestuser', + main_user_password='testtestt3st', # Try to limit the impact & test options. multi_az=False, backup_retention_period=0 diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py index 490618e1..61685081 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/integration/redshift/test_layer1.py @@ -36,8 +36,8 @@ def setUp(self): self.api = RedshiftConnection() self.cluster_prefix = 'boto-redshift-cluster-%s' self.node_type = 'dw.hs1.xlarge' - self.master_username = 'mrtest' - self.master_password = 'P4ssword' + self.main_username = 'mrtest' + self.main_password = 'P4ssword' self.db_name = 'simon' # Redshift was taking ~20 minutes to bring clusters up in testing. self.wait_time = 60 * 20 @@ -50,7 +50,7 @@ def create_cluster(self): cluster_id = self.cluster_id() self.api.create_cluster( cluster_id, self.node_type, - self.master_username, self.master_password, + self.main_username, self.main_password, db_name=self.db_name, number_of_nodes=3 ) @@ -71,7 +71,7 @@ def test_create_delete_cluster(self): cluster_id = self.cluster_id() self.api.create_cluster( cluster_id, self.node_type, - self.master_username, self.master_password, + self.main_username, self.main_password, db_name=self.db_name, number_of_nodes=3 ) diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py index ca13d1c0..68637ca3 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_connection.py @@ -193,7 +193,7 @@ def default_body(self): 2014-01-24T02:19:46Z - Master instance group + Main instance group 1 0 MASTER @@ -253,7 +253,7 @@ def test_list_instance_groups(self): self.assertEqual(response.instancegroups[0].instancetype, "m1.large") self.assertEqual(response.instancegroups[0].market, "ON_DEMAND") self.assertEqual( - response.instancegroups[0].name, "Master instance group") + response.instancegroups[0].name, "Main instance group") self.assertEqual( response.instancegroups[0].requestedinstancecount, '1') self.assertEqual(response.instancegroups[0].runninginstancecount, '0') @@ -587,7 +587,7 @@ def default_body(self): false - ec2-184-0-0-1.us-west-1.compute.amazonaws.com + ec2-184-0-0-1.us-west-1.compute.amazonaws.com 10 my-service-role @@ -622,7 +622,7 @@ def test_describe_cluster(self): self.assertEqual(response.applications[0].name, 'hadoop') self.assertEqual(response.applications[0].version, '1.0.3') self.assertEqual( - response.masterpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') + response.mainpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') self.assertEqual(response.normalizedinstancehours, '10') self.assertEqual(response.servicerole, 'my-service-role') @@ -862,7 +862,7 @@ def default_body(self): us-west-1c - m1.large + m1.large my_key true @@ -879,7 +879,7 @@ def default_body(self): ON_DEMAND ig-aaaaaa MASTER - Master instance group + Main instance group 2014-01-24T01:21:21Z @@ -897,11 +897,11 @@ def default_body(self): Core instance group - m1.large - i-aaaaaa + m1.large + i-aaaaaa 1.0.3 12 - ec2-184-0-0-1.us-west-1.compute.amazonaws.com + ec2-184-0-0-1.us-west-1.compute.amazonaws.com 3 false @@ -930,15 +930,15 @@ def test_describe_jobflows_response(self): self.assertEqual(jf.name, 'test analytics') self.assertEqual(jf.jobflowid, 'j-aaaaaa') self.assertEqual(jf.ec2keyname, 'my_key') - self.assertEqual(jf.masterinstancetype, 'm1.large') + self.assertEqual(jf.maininstancetype, 'm1.large') self.assertEqual(jf.availabilityzone, 'us-west-1c') self.assertEqual(jf.keepjobflowalivewhennosteps, 'true') - self.assertEqual(jf.slaveinstancetype, 'm1.large') - self.assertEqual(jf.masterinstanceid, 'i-aaaaaa') + self.assertEqual(jf.subordinateinstancetype, 'm1.large') + self.assertEqual(jf.maininstanceid, 'i-aaaaaa') self.assertEqual(jf.hadoopversion, '1.0.3') self.assertEqual(jf.normalizedinstancehours, '12') self.assertEqual( - jf.masterpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') + jf.mainpublicdnsname, 'ec2-184-0-0-1.us-west-1.compute.amazonaws.com') self.assertEqual(jf.instancecount, '3') self.assertEqual(jf.terminationprotected, 'false') @@ -961,7 +961,7 @@ def test_describe_jobflows_response(self): self.assertEqual(ig.market, 'ON_DEMAND') self.assertEqual(ig.instancegroupid, 'ig-aaaaaa') self.assertEqual(ig.instancerole, 'MASTER') - self.assertEqual(ig.name, 'Master instance group') + self.assertEqual(ig.name, 'Main instance group') def test_describe_jobflows_no_args(self): self.set_http_response(200) @@ -1033,8 +1033,8 @@ def test_run_jobflow_service_role(self): 'Name': 'EmrCluster'}, ignore_params_values=['ActionOnFailure', 'Instances.InstanceCount', 'Instances.KeepJobFlowAliveWhenNoSteps', - 'Instances.MasterInstanceType', - 'Instances.SlaveInstanceType']) + 'Instances.MainInstanceType', + 'Instances.SubordinateInstanceType']) def test_run_jobflow_enable_debugging(self): self.region = 'ap-northeast-2' diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py index dda6b928..656bde7d 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_emr_responses.py @@ -85,8 +85,8 @@ us-east-1a - m1.small - m1.small + m1.small + m1.small myec2keyname 4 true @@ -281,8 +281,8 @@ j-3H3Q13JPFLU22 - m1.large - i-64c21609 + m1.large + i-64c21609 us-east-1b @@ -300,7 +300,7 @@ Job flow terminated MASTER ig-EVMHOZJ2SCO8 - master + main 2010-10-21T01:00:25Z @@ -315,13 +315,13 @@ Job flow terminated CORE ig-YZHDYVITVHKB - slave + subordinate 40 0.20 - m1.large - ec2-184-72-153-139.compute-1.amazonaws.com + m1.large + ec2-184-72-153-139.compute-1.amazonaws.com myubersecurekey 10 false @@ -361,8 +361,8 @@ def test_JobFlows_example(self): loguri='mybucket/subdir/', name='MyJobFlowName', availabilityzone='us-east-1a', - slaveinstancetype='m1.small', - masterinstancetype='m1.small', + subordinateinstancetype='m1.small', + maininstancetype='m1.small', ec2keyname='myec2keyname', keepjobflowalivewhennosteps='true') @@ -379,8 +379,8 @@ def test_JobFlows_completed(self): loguri='s3n://example.emrtest.scripts/jobflow_logs/', name='RealJobFlowName', availabilityzone='us-east-1b', - slaveinstancetype='m1.large', - masterinstancetype='m1.large', + subordinateinstancetype='m1.large', + maininstancetype='m1.large', ec2keyname='myubersecurekey', keepjobflowalivewhennosteps='false') self.assertEquals(6, len(jobflow.steps)) diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py index cc5c747b..eb8b0229 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/emr/test_instance_group_args.py @@ -19,7 +19,7 @@ def test_bidprice_missing_spot(self): """ with self.assertRaisesRegexp(ValueError, 'bidprice must be specified'): InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master') + 'SPOT', 'main') def test_bidprice_missing_ondemand(self): """ @@ -27,14 +27,14 @@ def test_bidprice_missing_ondemand(self): ON_DEMAND. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'ON_DEMAND', 'master') + 'ON_DEMAND', 'main') def test_bidprice_Decimal(self): """ Test InstanceGroup init works with bidprice type = Decimal. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice=Decimal(1.10)) + 'SPOT', 'main', bidprice=Decimal(1.10)) self.assertEquals('1.10', instance_group.bidprice[:4]) def test_bidprice_float(self): @@ -42,7 +42,7 @@ def test_bidprice_float(self): Test InstanceGroup init works with bidprice type = float. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice=1.1) + 'SPOT', 'main', bidprice=1.1) self.assertEquals('1.1', instance_group.bidprice) def test_bidprice_string(self): @@ -50,7 +50,7 @@ def test_bidprice_string(self): Test InstanceGroup init works with bidprice type = string. """ instance_group = InstanceGroup(1, 'MASTER', 'm1.small', - 'SPOT', 'master', bidprice='1.1') + 'SPOT', 'main', bidprice='1.1') self.assertEquals('1.1', instance_group.bidprice) if __name__ == "__main__": diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py index fbc65b09..8f4bc529 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_connection.py @@ -88,7 +88,7 @@ def default_body(self): 2012-10-03T22:01:51.047Z 200 db.m1.large - awsuser + awsuser @@ -150,7 +150,7 @@ def test_get_all_db_instances(self): db.endpoint, (u'mydbinstance2.c0hjqouvn9mf.us-west-2.rds.amazonaws.com', 3306)) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'awsuser') + self.assertEqual(db.main_username, 'awsuser') self.assertEqual(db.availability_zone, 'us-west-2b') self.assertEqual(db.backup_retention_period, 1) self.assertEqual(db.preferred_backup_window, '10:30-11:00') @@ -198,7 +198,7 @@ def default_body(self): mysql - **** + **** 0 false @@ -252,7 +252,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main @@ -267,7 +267,7 @@ def test_create_db_instance_param_group_name(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -283,8 +283,8 @@ def test_create_db_instance_param_group_name(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306 }, ignore_params_values=['Version']) @@ -293,10 +293,10 @@ def test_create_db_instance_param_group_name(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.pending_modified_values, - {'MasterUserPassword': '****'}) + {'MainUserPassword': '****'}) self.assertEqual(db.parameter_group.name, 'default.mysql5.1') @@ -312,7 +312,7 @@ def test_create_db_instance_param_group_instance(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group=param_group, db_subnet_group_name='dbSubnetgroup01') @@ -326,8 +326,8 @@ def test_create_db_instance_param_group_instance(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, }, ignore_params_values=['Version']) @@ -336,10 +336,10 @@ def test_create_db_instance_param_group_instance(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.pending_modified_values, - {'MasterUserPassword': '****'}) + {'MainUserPassword': '****'}) self.assertEqual(db.parameter_group.name, 'default.mysql5.1') self.assertEqual(db.parameter_group.description, None) @@ -383,7 +383,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main @@ -411,7 +411,7 @@ def test_restore_dbinstance_from_point_in_time(self): self.assertEqual(db.status, 'creating') self.assertEqual(db.allocated_storage, 10) self.assertEqual(db.instance_class, 'db.m1.large') - self.assertEqual(db.master_username, 'master') + self.assertEqual(db.main_username, 'main') self.assertEqual(db.multi_az, False) self.assertEqual(db.parameter_group.name, @@ -445,7 +445,7 @@ def test_create_db_instance_vpc_sg_str(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -460,8 +460,8 @@ def test_create_db_instance_vpc_sg_str(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, 'VpcSecurityGroupIds.member.1': 'sg-1', 'VpcSecurityGroupIds.member.2': 'sg-2' @@ -481,7 +481,7 @@ def test_create_db_instance_vpc_sg_obj(self): 'SimCoProd01', 10, 'db.m1.large', - 'master', + 'main', 'Password01', param_group='default.mysql5.1', db_subnet_group_name='dbSubnetgroup01', @@ -496,8 +496,8 @@ def test_create_db_instance_vpc_sg_obj(self): 'DBParameterGroupName': 'default.mysql5.1', 'DBSubnetGroupName': 'dbSubnetgroup01', 'Engine': 'MySQL5.1', - 'MasterUsername': 'master', - 'MasterUserPassword': 'Password01', + 'MainUsername': 'main', + 'MainUserPassword': 'Password01', 'Port': 3306, 'VpcSecurityGroupIds.member.1': 'sg-1', 'VpcSecurityGroupIds.member.2': 'sg-2' @@ -674,9 +674,9 @@ class TestRDSLogFileDownload(AWSMockServiceTestCase): 2014-01-27 09:35:15.44 spid74 I/O is frozen on database rdsadmin. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. -2014-01-27 09:35:15.44 spid73 I/O is frozen on database master. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. +2014-01-27 09:35:15.44 spid73 I/O is frozen on database main. No user action is required. However, if I/O is not resumed promptly, you could cancel the backup. -2014-01-27 09:35:25.57 spid73 I/O was resumed on database master. No user action is required. +2014-01-27 09:35:25.57 spid73 I/O was resumed on database main. No user action is required. 2014-01-27 09:35:25.57 spid74 I/O was resumed on database rdsadmin. No user action is required. diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py index c3c9d8a6..aded3ccd 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/rds/test_snapshot.py @@ -27,7 +27,7 @@ def default_body(self): 5.1.50 mydbsnapshot manual - master + main myoptiongroupname 1000 100 @@ -47,7 +47,7 @@ def default_body(self): 5.1.49 mysnapshot1 manual - sa + sa myoptiongroupname 1000 @@ -64,7 +64,7 @@ def default_body(self): 5.1.47 rds:simcoprod01-2012-04-02-00-01 automated - master + main myoptiongroupname 1000 @@ -118,7 +118,7 @@ def default_body(self): 5.1.50 mydbsnapshot manual - master + main @@ -160,7 +160,7 @@ def default_body(self): 5.1.50 mycopieddbsnapshot manual - master + main @@ -202,7 +202,7 @@ def default_body(self): 5.1.47 mysnapshot2 manual - master + main @@ -257,7 +257,7 @@ def default_body(self): sat:07:30-sat:08:00 10 db.m1.large - master + main diff --git a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py index 73d77248..accfa4d4 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py +++ b/google-cloud-sdk/platform/gsutil/third_party/boto/tests/unit/route53/test_connection.py @@ -509,7 +509,7 @@ def default_body(self): 1800 - ns-1929.awsdns-93.net. hostmaster.awsdns.net. 1 10800 3600 604800 1800 + ns-1929.awsdns-93.net. hostmain.awsdns.net. 1 10800 3600 604800 1800 diff --git a/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py b/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py index 87abe837..b8c0f1a7 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/crcmod/docs/source/conf.py @@ -36,8 +36,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'crcmod' diff --git a/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py b/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py index dd20a54c..29a68632 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/fasteners/doc/source/conf.py @@ -48,8 +48,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'Fasteners' @@ -229,7 +229,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'Fasteners.tex', u'Fasteners Documentation', + (main_doc, 'Fasteners.tex', u'Fasteners Documentation', u'Joshua Harlow', 'manual'), ] @@ -259,7 +259,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'fasteners', u'Fasteners Documentation', + (main_doc, 'fasteners', u'Fasteners Documentation', [author], 1) ] @@ -273,7 +273,7 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'Fasteners', u'Fasteners Documentation', + (main_doc, 'Fasteners', u'Fasteners Documentation', author, 'Fasteners', 'One line description of project.', 'Miscellaneous'), ] diff --git a/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py index c6e4194c..3b1747c7 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/funcsigs/docs/conf.py @@ -37,8 +37,8 @@ # The encoding of source files. #source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = 'funcsigs' diff --git a/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py index d32357da..b4173248 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/mock/docs/conf.py @@ -62,8 +62,8 @@ def __init__(self): # The suffix of source filenames. source_suffix = '.txt' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General substitutions. project = u'Mock' diff --git a/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py b/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py index 1b4663b2..5e8eb9ce 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/oauth2client/docs/conf.py @@ -57,7 +57,7 @@ def __getattr__(cls, name): ] templates_path = ['_templates'] source_suffix = '.rst' -master_doc = 'index' +main_doc = 'index' # General information about the project. project = u'oauth2client' diff --git a/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py b/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py index 1e91e209..d05038fa 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/pyasn1/docs/source/conf.py @@ -42,8 +42,8 @@ # The encoding of source files. # source_encoding = 'utf-8-sig' -# The master toctree document. -master_doc = 'contents' +# The main toctree document. +main_doc = 'contents' # General information about the project. project = u'ASN.1 types and codecs' @@ -242,7 +242,7 @@ # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - (master_doc, 'PyASN1.tex', u'PyASN1 Documentation', + (main_doc, 'PyASN1.tex', u'PyASN1 Documentation', u'Ilya Etingof \\textless{}etingof@gmail.com\\textgreater{}', 'manual'), ] @@ -272,7 +272,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - (master_doc, 'pyasn1', u'PyASN1 Documentation', + (main_doc, 'pyasn1', u'PyASN1 Documentation', [author], 1) ] @@ -286,7 +286,7 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - (master_doc, 'PyASN1', u'PyASN1 Documentation', + (main_doc, 'PyASN1', u'PyASN1 Documentation', author, 'PyASN1', 'One line description of project.', 'Miscellaneous'), ] diff --git a/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py b/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py index 95317b21..06219794 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/rsa/doc/conf.py @@ -41,8 +41,8 @@ # The encoding of source files. source_encoding = 'utf-8' -# The master toctree document. -master_doc = 'index' +# The main toctree document. +main_doc = 'index' # General information about the project. project = u'Python-RSA' diff --git a/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py b/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py index 0215bdd4..a7cd039e 100644 --- a/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py +++ b/google-cloud-sdk/platform/gsutil/third_party/six/documentation/conf.py @@ -28,8 +28,8 @@ # The encoding of source files. #source_encoding = "utf-8-sig" -# The master toctree document. -master_doc = "index" +# The main toctree document. +main_doc = "index" # General information about the project. project = u"six"