pulumi-gcp 7.20.0a1713984378__py3-none-any.whl → 7.21.0__py3-none-any.whl

pulumi_gcp/cloudfunctionsv2/function.py

@@ -824,6 +824,61 @@ class Function(pulumi.CustomResource):
                 ],
             ))
         ```
+        ### Cloudfunctions2 Basic Builder
+
+        ```python
+        import pulumi
+        import pulumi_gcp as gcp
+        import pulumi_time as time
+
+        project = "my-project-name"
+        account = gcp.serviceaccount.Account("account",
+            account_id="gcf-sa",
+            display_name="Test Service Account")
+        log_writer = gcp.projects.IAMMember("log_writer",
+            project=account.project,
+            role="roles/logging.logWriter",
+            member=account.email.apply(lambda email: f"serviceAccount:{email}"))
+        artifact_registry_writer = gcp.projects.IAMMember("artifact_registry_writer",
+            project=account.project,
+            role="roles/artifactregistry.writer",
+            member=account.email.apply(lambda email: f"serviceAccount:{email}"))
+        storage_object_admin = gcp.projects.IAMMember("storage_object_admin",
+            project=account.project,
+            role="roles/storage.objectAdmin",
+            member=account.email.apply(lambda email: f"serviceAccount:{email}"))
+        bucket = gcp.storage.Bucket("bucket",
+            name=f"{project}-gcf-source",
+            location="US",
+            uniform_bucket_level_access=True)
+        object = gcp.storage.BucketObject("object",
+            name="function-source.zip",
+            bucket=bucket.name,
+            source=pulumi.FileAsset("function-source.zip"))
+        # builder permissions need to stablize before it can pull the source zip
+        wait60s = time.index.Sleep("wait_60s", create_duration=60s)
+        function = gcp.cloudfunctionsv2.Function("function",
+            name="function-v2",
+            location="us-central1",
+            description="a new function",
+            build_config=gcp.cloudfunctionsv2.FunctionBuildConfigArgs(
+                runtime="nodejs16",
+                entry_point="helloHttp",
+                source=gcp.cloudfunctionsv2.FunctionBuildConfigSourceArgs(
+                    storage_source=gcp.cloudfunctionsv2.FunctionBuildConfigSourceStorageSourceArgs(
+                        bucket=bucket.name,
+                        object=object.name,
+                    ),
+                ),
+                service_account=account.id,
+            ),
+            service_config=gcp.cloudfunctionsv2.FunctionServiceConfigArgs(
+                max_instance_count=1,
+                available_memory="256M",
+                timeout_seconds=60,
+            ))
+        pulumi.export("functionUri", function.service_config.uri)
+        ```
         ### Cloudfunctions2 Secret Env
 
         ```python
@@ -1436,6 +1491,61 @@ class Function(pulumi.CustomResource):
                 ],
             ))
         ```
+        ### Cloudfunctions2 Basic Builder
+
+        ```python
+        import pulumi
+        import pulumi_gcp as gcp
+        import pulumi_time as time
+
+        project = "my-project-name"
+        account = gcp.serviceaccount.Account("account",
+            account_id="gcf-sa",
+            display_name="Test Service Account")
+        log_writer = gcp.projects.IAMMember("log_writer",
+            project=account.project,
+            role="roles/logging.logWriter",
+            member=account.email.apply(lambda email: f"serviceAccount:{email}"))
+        artifact_registry_writer = gcp.projects.IAMMember("artifact_registry_writer",
+            project=account.project,
+            role="roles/artifactregistry.writer",
+            member=account.email.apply(lambda email: f"serviceAccount:{email}"))
+        storage_object_admin = gcp.projects.IAMMember("storage_object_admin",
+            project=account.project,
+            role="roles/storage.objectAdmin",
+            member=account.email.apply(lambda email: f"serviceAccount:{email}"))
+        bucket = gcp.storage.Bucket("bucket",
+            name=f"{project}-gcf-source",
+            location="US",
+            uniform_bucket_level_access=True)
+        object = gcp.storage.BucketObject("object",
+            name="function-source.zip",
+            bucket=bucket.name,
+            source=pulumi.FileAsset("function-source.zip"))
+        # builder permissions need to stablize before it can pull the source zip
+        wait60s = time.index.Sleep("wait_60s", create_duration=60s)
+        function = gcp.cloudfunctionsv2.Function("function",
+            name="function-v2",
+            location="us-central1",
+            description="a new function",
+            build_config=gcp.cloudfunctionsv2.FunctionBuildConfigArgs(
+                runtime="nodejs16",
+                entry_point="helloHttp",
+                source=gcp.cloudfunctionsv2.FunctionBuildConfigSourceArgs(
+                    storage_source=gcp.cloudfunctionsv2.FunctionBuildConfigSourceStorageSourceArgs(
+                        bucket=bucket.name,
+                        object=object.name,
+                    ),
+                ),
+                service_account=account.id,
+            ),
+            service_config=gcp.cloudfunctionsv2.FunctionServiceConfigArgs(
+                max_instance_count=1,
+                available_memory="256M",
+                timeout_seconds=60,
+            ))
+        pulumi.export("functionUri", function.service_config.uri)
+        ```
         ### Cloudfunctions2 Secret Env
 
         ```python

pulumi_gcp/cloudfunctionsv2/outputs.py

@@ -46,6 +46,8 @@ class FunctionBuildConfig(dict):
             suggest = "entry_point"
         elif key == "environmentVariables":
             suggest = "environment_variables"
+        elif key == "serviceAccount":
+            suggest = "service_account"
         elif key == "workerPool":
             suggest = "worker_pool"
 
@@ -66,6 +68,7 @@ class FunctionBuildConfig(dict):
                  entry_point: Optional[str] = None,
                  environment_variables: Optional[Mapping[str, str]] = None,
                  runtime: Optional[str] = None,
+                 service_account: Optional[str] = None,
                  source: Optional['outputs.FunctionBuildConfigSource'] = None,
                  worker_pool: Optional[str] = None):
         """
@@ -81,6 +84,7 @@ class FunctionBuildConfig(dict):
         :param Mapping[str, str] environment_variables: User-provided build-time environment variables for the function.
         :param str runtime: The runtime in which to run the function. Required when deploying a new
                function, optional when updating an existing function.
+        :param str service_account: The fully-qualified name of the service account to be used for building the container.
         :param 'FunctionBuildConfigSourceArgs' source: The location of the function source code.
                Structure is documented below.
         :param str worker_pool: Name of the Cloud Build Custom Worker Pool that should be used to build the function.
@@ -95,6 +99,8 @@ class FunctionBuildConfig(dict):
             pulumi.set(__self__, "environment_variables", environment_variables)
         if runtime is not None:
             pulumi.set(__self__, "runtime", runtime)
+        if service_account is not None:
+            pulumi.set(__self__, "service_account", service_account)
         if source is not None:
             pulumi.set(__self__, "source", source)
         if worker_pool is not None:
@@ -147,6 +153,14 @@ class FunctionBuildConfig(dict):
         """
         return pulumi.get(self, "runtime")
 
+    @property
+    @pulumi.getter(name="serviceAccount")
+    def service_account(self) -> Optional[str]:
+        """
+        The fully-qualified name of the service account to be used for building the container.
+        """
+        return pulumi.get(self, "service_account")
+
     @property
     @pulumi.getter
     def source(self) -> Optional['outputs.FunctionBuildConfigSource']:
@@ -1093,6 +1107,7 @@ class GetFunctionBuildConfigResult(dict):
                  entry_point: str,
                  environment_variables: Mapping[str, str],
                  runtime: str,
+                 service_account: str,
                  sources: Sequence['outputs.GetFunctionBuildConfigSourceResult'],
                  worker_pool: str):
         """
@@ -1107,6 +1122,7 @@ class GetFunctionBuildConfigResult(dict):
         :param Mapping[str, str] environment_variables: User-provided build-time environment variables for the function.
         :param str runtime: The runtime in which to run the function. Required when deploying a new
                function, optional when updating an existing function.
+        :param str service_account: The fully-qualified name of the service account to be used for building the container.
         :param Sequence['GetFunctionBuildConfigSourceArgs'] sources: The location of the function source code.
         :param str worker_pool: Name of the Cloud Build Custom Worker Pool that should be used to build the function.
         """
@@ -1115,6 +1131,7 @@ class GetFunctionBuildConfigResult(dict):
         pulumi.set(__self__, "entry_point", entry_point)
         pulumi.set(__self__, "environment_variables", environment_variables)
         pulumi.set(__self__, "runtime", runtime)
+        pulumi.set(__self__, "service_account", service_account)
         pulumi.set(__self__, "sources", sources)
         pulumi.set(__self__, "worker_pool", worker_pool)
 
@@ -1164,6 +1181,14 @@ class GetFunctionBuildConfigResult(dict):
         """
         return pulumi.get(self, "runtime")
 
+    @property
+    @pulumi.getter(name="serviceAccount")
+    def service_account(self) -> str:
+        """
+        The fully-qualified name of the service account to be used for building the container.
+        """
+        return pulumi.get(self, "service_account")
+
     @property
     @pulumi.getter
     def sources(self) -> Sequence['outputs.GetFunctionBuildConfigSourceResult']:

pulumi_gcp/cloudrunv2/job.py

@@ -263,8 +263,6 @@ class _JobState:
                A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z".
         :param pulumi.Input[str] creator: Email address of the authenticated creator.
         :param pulumi.Input[str] delete_time: The deletion time.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_annotations: All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-               Terraform, other clients and services.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_labels: All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Pulumi, other clients and services.
         :param pulumi.Input[str] etag: A system-generated fingerprint for this version of the resource. May be used to detect modification conflict during updates.
         :param pulumi.Input[int] execution_count: Number of executions created for this job.
@@ -468,10 +466,6 @@ class _JobState:
     @property
     @pulumi.getter(name="effectiveAnnotations")
     def effective_annotations(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
-        """
-        All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-        Terraform, other clients and services.
-        """
         return pulumi.get(self, "effective_annotations")
 
     @effective_annotations.setter
@@ -1470,8 +1464,6 @@ class Job(pulumi.CustomResource):
                A timestamp in RFC3339 UTC "Zulu" format, with nanosecond resolution and up to nine fractional digits. Examples: "2014-10-02T15:01:23Z" and "2014-10-02T15:01:23.045123456Z".
         :param pulumi.Input[str] creator: Email address of the authenticated creator.
         :param pulumi.Input[str] delete_time: The deletion time.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_annotations: All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-               Terraform, other clients and services.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_labels: All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Pulumi, other clients and services.
         :param pulumi.Input[str] etag: A system-generated fingerprint for this version of the resource. May be used to detect modification conflict during updates.
         :param pulumi.Input[int] execution_count: Number of executions created for this job.
@@ -1620,10 +1612,6 @@ class Job(pulumi.CustomResource):
     @property
     @pulumi.getter(name="effectiveAnnotations")
     def effective_annotations(self) -> pulumi.Output[Mapping[str, str]]:
-        """
-        All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-        Terraform, other clients and services.
-        """
         return pulumi.get(self, "effective_annotations")
 
     @property

pulumi_gcp/cloudrunv2/service.py

@@ -362,8 +362,6 @@ class _ServiceState:
                https://cloud.google.com/run/docs/configuring/custom-audiences.
         :param pulumi.Input[str] delete_time: The deletion time.
         :param pulumi.Input[str] description: User-provided description of the Service. This field currently has a 512-character limit.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_annotations: All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-               Terraform, other clients and services.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_labels: All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Pulumi, other clients and services.
         :param pulumi.Input[str] etag: A system-generated fingerprint for this version of the resource. May be used to detect modification conflict during updates.
         :param pulumi.Input[str] expire_time: For a deleted resource, the time after which it will be permamently deleted.
@@ -614,10 +612,6 @@ class _ServiceState:
     @property
     @pulumi.getter(name="effectiveAnnotations")
     def effective_annotations(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
-        """
-        All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-        Terraform, other clients and services.
-        """
         return pulumi.get(self, "effective_annotations")
 
     @effective_annotations.setter
@@ -1966,8 +1960,6 @@ class Service(pulumi.CustomResource):
                https://cloud.google.com/run/docs/configuring/custom-audiences.
         :param pulumi.Input[str] delete_time: The deletion time.
         :param pulumi.Input[str] description: User-provided description of the Service. This field currently has a 512-character limit.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_annotations: All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-               Terraform, other clients and services.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_labels: All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Pulumi, other clients and services.
         :param pulumi.Input[str] etag: A system-generated fingerprint for this version of the resource. May be used to detect modification conflict during updates.
         :param pulumi.Input[str] expire_time: For a deleted resource, the time after which it will be permamently deleted.
@@ -2148,10 +2140,6 @@ class Service(pulumi.CustomResource):
     @property
     @pulumi.getter(name="effectiveAnnotations")
     def effective_annotations(self) -> pulumi.Output[Mapping[str, str]]:
-        """
-        All of annotations (key/value pairs) present on the resource in GCP, including the annotations configured through
-        Terraform, other clients and services.
-        """
         return pulumi.get(self, "effective_annotations")
 
     @property

pulumi_gcp/composer/__init__.py

@@ -8,5 +8,6 @@ import typing
 from .environment import *
 from .get_environment import *
 from .get_image_versions import *
+from .user_workloads_secret import *
 from ._inputs import *
 from . import outputs

pulumi_gcp/composer/environment.py

@@ -27,11 +27,11 @@ class EnvironmentArgs:
         :param pulumi.Input['EnvironmentConfigArgs'] config: Configuration parameters for this environment.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] labels: User-defined labels for this environment. The labels map can contain no more than 64 entries. Entries of the labels map
                are UTF8 strings that comply with the following restrictions: Label keys must be between 1 and 63 characters long and
-               must conform to the following regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-               characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No more than 64 labels can be
-               associated with a given environment. Both keys and values must be <= 128 bytes in size. **Note**: This field is
-               non-authoritative, and will only manage the labels present in your configuration. Please refer to the field
-               'effective_labels' for all of the labels present on the resource.
+               must conform to the following regular expression: a-z?. Label values must be between 0 and 63 characters long and must
+               conform to the regular expression (a-z?)?. No more than 64 labels can be associated with a given environment. Both keys
+               and values must be <= 128 bytes in size. **Note**: This field is non-authoritative, and will only manage the labels
+               present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the
+               resource.
         :param pulumi.Input[str] name: Name of the environment.
         :param pulumi.Input[str] project: The ID of the project in which the resource belongs. If it is not provided, the provider project is used.
         :param pulumi.Input[str] region: The location or Compute Engine region for the environment.
@@ -68,11 +68,11 @@ class EnvironmentArgs:
         """
         User-defined labels for this environment. The labels map can contain no more than 64 entries. Entries of the labels map
         are UTF8 strings that comply with the following restrictions: Label keys must be between 1 and 63 characters long and
-        must conform to the following regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-        characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No more than 64 labels can be
-        associated with a given environment. Both keys and values must be <= 128 bytes in size. **Note**: This field is
-        non-authoritative, and will only manage the labels present in your configuration. Please refer to the field
-        'effective_labels' for all of the labels present on the resource.
+        must conform to the following regular expression: a-z?. Label values must be between 0 and 63 characters long and must
+        conform to the regular expression (a-z?)?. No more than 64 labels can be associated with a given environment. Both keys
+        and values must be <= 128 bytes in size. **Note**: This field is non-authoritative, and will only manage the labels
+        present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the
+        resource.
         """
         return pulumi.get(self, "labels")
 
@@ -143,15 +143,13 @@ class _EnvironmentState:
         """
         Input properties used for looking up and filtering Environment resources.
         :param pulumi.Input['EnvironmentConfigArgs'] config: Configuration parameters for this environment.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_labels: All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Terraform, other
-               clients and services.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] labels: User-defined labels for this environment. The labels map can contain no more than 64 entries. Entries of the labels map
                are UTF8 strings that comply with the following restrictions: Label keys must be between 1 and 63 characters long and
-               must conform to the following regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-               characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No more than 64 labels can be
-               associated with a given environment. Both keys and values must be <= 128 bytes in size. **Note**: This field is
-               non-authoritative, and will only manage the labels present in your configuration. Please refer to the field
-               'effective_labels' for all of the labels present on the resource.
+               must conform to the following regular expression: a-z?. Label values must be between 0 and 63 characters long and must
+               conform to the regular expression (a-z?)?. No more than 64 labels can be associated with a given environment. Both keys
+               and values must be <= 128 bytes in size. **Note**: This field is non-authoritative, and will only manage the labels
+               present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the
+               resource.
         :param pulumi.Input[str] name: Name of the environment.
         :param pulumi.Input[str] project: The ID of the project in which the resource belongs. If it is not provided, the provider project is used.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] pulumi_labels: The combination of labels configured directly on the resource and default labels configured on the provider.
@@ -190,10 +188,6 @@ class _EnvironmentState:
     @property
     @pulumi.getter(name="effectiveLabels")
     def effective_labels(self) -> Optional[pulumi.Input[Mapping[str, pulumi.Input[str]]]]:
-        """
-        All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Terraform, other
-        clients and services.
-        """
         return pulumi.get(self, "effective_labels")
 
     @effective_labels.setter
@@ -206,11 +200,11 @@ class _EnvironmentState:
         """
         User-defined labels for this environment. The labels map can contain no more than 64 entries. Entries of the labels map
         are UTF8 strings that comply with the following restrictions: Label keys must be between 1 and 63 characters long and
-        must conform to the following regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-        characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No more than 64 labels can be
-        associated with a given environment. Both keys and values must be <= 128 bytes in size. **Note**: This field is
-        non-authoritative, and will only manage the labels present in your configuration. Please refer to the field
-        'effective_labels' for all of the labels present on the resource.
+        must conform to the following regular expression: a-z?. Label values must be between 0 and 63 characters long and must
+        conform to the regular expression (a-z?)?. No more than 64 labels can be associated with a given environment. Both keys
+        and values must be <= 128 bytes in size. **Note**: This field is non-authoritative, and will only manage the labels
+        present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the
+        resource.
         """
         return pulumi.get(self, "labels")
 
@@ -321,11 +315,11 @@ class Environment(pulumi.CustomResource):
         :param pulumi.Input[pulumi.InputType['EnvironmentConfigArgs']] config: Configuration parameters for this environment.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] labels: User-defined labels for this environment. The labels map can contain no more than 64 entries. Entries of the labels map
                are UTF8 strings that comply with the following restrictions: Label keys must be between 1 and 63 characters long and
-               must conform to the following regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-               characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No more than 64 labels can be
-               associated with a given environment. Both keys and values must be <= 128 bytes in size. **Note**: This field is
-               non-authoritative, and will only manage the labels present in your configuration. Please refer to the field
-               'effective_labels' for all of the labels present on the resource.
+               must conform to the following regular expression: a-z?. Label values must be between 0 and 63 characters long and must
+               conform to the regular expression (a-z?)?. No more than 64 labels can be associated with a given environment. Both keys
+               and values must be <= 128 bytes in size. **Note**: This field is non-authoritative, and will only manage the labels
+               present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the
+               resource.
         :param pulumi.Input[str] name: Name of the environment.
         :param pulumi.Input[str] project: The ID of the project in which the resource belongs. If it is not provided, the provider project is used.
         :param pulumi.Input[str] region: The location or Compute Engine region for the environment.
@@ -428,15 +422,13 @@ class Environment(pulumi.CustomResource):
         :param pulumi.Input[str] id: The unique provider ID of the resource to lookup.
         :param pulumi.ResourceOptions opts: Options for the resource.
         :param pulumi.Input[pulumi.InputType['EnvironmentConfigArgs']] config: Configuration parameters for this environment.
-        :param pulumi.Input[Mapping[str, pulumi.Input[str]]] effective_labels: All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Terraform, other
-               clients and services.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] labels: User-defined labels for this environment. The labels map can contain no more than 64 entries. Entries of the labels map
                are UTF8 strings that comply with the following restrictions: Label keys must be between 1 and 63 characters long and
-               must conform to the following regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-               characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No more than 64 labels can be
-               associated with a given environment. Both keys and values must be <= 128 bytes in size. **Note**: This field is
-               non-authoritative, and will only manage the labels present in your configuration. Please refer to the field
-               'effective_labels' for all of the labels present on the resource.
+               must conform to the following regular expression: a-z?. Label values must be between 0 and 63 characters long and must
+               conform to the regular expression (a-z?)?. No more than 64 labels can be associated with a given environment. Both keys
+               and values must be <= 128 bytes in size. **Note**: This field is non-authoritative, and will only manage the labels
+               present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the
+               resource.
         :param pulumi.Input[str] name: Name of the environment.
         :param pulumi.Input[str] project: The ID of the project in which the resource belongs. If it is not provided, the provider project is used.
         :param pulumi.Input[Mapping[str, pulumi.Input[str]]] pulumi_labels: The combination of labels configured directly on the resource and default labels configured on the provider.
@@ -468,10 +460,6 @@ class Environment(pulumi.CustomResource):
     @property
     @pulumi.getter(name="effectiveLabels")
     def effective_labels(self) -> pulumi.Output[Mapping[str, str]]:
-        """
-        All of labels (key/value pairs) present on the resource in GCP, including the labels configured through Terraform, other
-        clients and services.
-        """
         return pulumi.get(self, "effective_labels")
 
     @property
@@ -480,11 +468,11 @@ class Environment(pulumi.CustomResource):
         """
         User-defined labels for this environment. The labels map can contain no more than 64 entries. Entries of the labels map
         are UTF8 strings that comply with the following restrictions: Label keys must be between 1 and 63 characters long and
-        must conform to the following regular expression: [a-z]([-a-z0-9]*[a-z0-9])?. Label values must be between 0 and 63
-        characters long and must conform to the regular expression ([a-z]([-a-z0-9]*[a-z0-9])?)?. No more than 64 labels can be
-        associated with a given environment. Both keys and values must be <= 128 bytes in size. **Note**: This field is
-        non-authoritative, and will only manage the labels present in your configuration. Please refer to the field
-        'effective_labels' for all of the labels present on the resource.
+        must conform to the following regular expression: a-z?. Label values must be between 0 and 63 characters long and must
+        conform to the regular expression (a-z?)?. No more than 64 labels can be associated with a given environment. Both keys
+        and values must be <= 128 bytes in size. **Note**: This field is non-authoritative, and will only manage the labels
+        present in your configuration. Please refer to the field 'effective_labels' for all of the labels present on the
+        resource.
         """
         return pulumi.get(self, "labels")