Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgraded DCL #4152

Merged
merged 1 commit into from
Mar 24, 2022
Merged

Upgraded DCL #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/5847.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
eventarc: added gke and workflows destination for eventarc trigger resource.
```
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/hashicorp/terraform-provider-google-beta
require (
cloud.google.com/go/bigtable v1.13.0
cloud.google.com/go/iam v0.1.1 // indirect
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220316014534-ac1c1c4fdb29
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.1.0
github.com/apparentlymart/go-cidr v1.1.0
github.com/client9/misspell v0.3.4
github.com/davecgh/go-spew v1.1.1
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1541,3 +1541,5 @@ github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-202203
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220316014534-ac1c1c4fdb29/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220316014534-ac1c1c4fdb29 h1:bxYB6H8CwwCyfT1QQqnsn3rmy+TNILPTdtH9IwrgsmE=
github.com/GoogleCloudPlatform/declarative-resource-client-library v0.0.0-20220316014534-ac1c1c4fdb29/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.1.0 h1:6EDY4EUsCW/mTRzYJ8SEzL2V5JACYCiIswnbhpaAwaY=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.1.0/go.mod h1:UJoDYx6t3+xCOd+dZX8+NrEB+Y/eW1pQlvxh2Gt7y5E=
40 changes: 20 additions & 20 deletions google-beta/resource_container_aws_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func resourceContainerAwsCluster() *schema.Resource {
"authorization": {
Type: schema.TypeList,
Required: true,
Description: "Required. Configuration related to the cluster RBAC settings.",
Description: "Configuration related to the cluster RBAC settings.",
MaxItems: 1,
Elem: ContainerAwsClusterAuthorizationSchema(),
},
Expand All @@ -57,13 +57,13 @@ func resourceContainerAwsCluster() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The AWS region where the cluster runs. Each Google Cloud region supports a subset of nearby AWS regions. You can call to list all supported AWS regions within a given Google Cloud region.",
Description: "The AWS region where the cluster runs. Each Google Cloud region supports a subset of nearby AWS regions. You can call to list all supported AWS regions within a given Google Cloud region.",
},

"control_plane": {
Type: schema.TypeList,
Required: true,
Description: "Required. Configuration related to the cluster control plane.",
Description: "Configuration related to the cluster control plane.",
MaxItems: 1,
Elem: ContainerAwsClusterControlPlaneSchema(),
},
Expand Down Expand Up @@ -95,7 +95,7 @@ func resourceContainerAwsCluster() *schema.Resource {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "Required. Cluster-wide networking configuration.",
Description: "Cluster-wide networking configuration.",
MaxItems: 1,
Elem: ContainerAwsClusterNetworkingSchema(),
},
Expand Down Expand Up @@ -180,7 +180,7 @@ func ContainerAwsClusterAuthorizationSchema() *schema.Resource {
"admin_users": {
Type: schema.TypeList,
Required: true,
Description: "Required. Users to perform operations as a cluster admin. A managed ClusterRoleBinding will be created to grant the `cluster-admin` ClusterRole to the users. At most one user can be specified. For more info on RBAC, see https://kubernetes.io/docs/reference/access-authn-authz/rbac/#user-facing-roles",
Description: "Users to perform operations as a cluster admin. A managed ClusterRoleBinding will be created to grant the `cluster-admin` ClusterRole to the users. At most one user can be specified. For more info on RBAC, see https://kubernetes.io/docs/reference/access-authn-authz/rbac/#user-facing-roles",
Elem: ContainerAwsClusterAuthorizationAdminUsersSchema(),
},
},
Expand All @@ -193,7 +193,7 @@ func ContainerAwsClusterAuthorizationAdminUsersSchema() *schema.Resource {
"username": {
Type: schema.TypeString,
Required: true,
Description: "Required. The name of the user, e.g. `my-gcp-id@gmail.com`.",
Description: "The name of the user, e.g. `my-gcp-id@gmail.com`.",
},
},
}
Expand All @@ -205,15 +205,15 @@ func ContainerAwsClusterControlPlaneSchema() *schema.Resource {
"aws_services_authentication": {
Type: schema.TypeList,
Required: true,
Description: "Required. Authentication configuration for management of AWS resources.",
Description: "Authentication configuration for management of AWS resources.",
MaxItems: 1,
Elem: ContainerAwsClusterControlPlaneAwsServicesAuthenticationSchema(),
},

"config_encryption": {
Type: schema.TypeList,
Required: true,
Description: "Required. The ARN of the AWS KMS key used to encrypt cluster configuration.",
Description: "The ARN of the AWS KMS key used to encrypt cluster configuration.",
MaxItems: 1,
Elem: ContainerAwsClusterControlPlaneConfigEncryptionSchema(),
},
Expand All @@ -222,7 +222,7 @@ func ContainerAwsClusterControlPlaneSchema() *schema.Resource {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "Required. The ARN of the AWS KMS key used to encrypt cluster secrets.",
Description: "The ARN of the AWS KMS key used to encrypt cluster secrets.",
MaxItems: 1,
Elem: ContainerAwsClusterControlPlaneDatabaseEncryptionSchema(),
},
Expand All @@ -231,28 +231,28 @@ func ContainerAwsClusterControlPlaneSchema() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The name of the AWS IAM instance pofile to assign to each control plane replica.",
Description: "The name of the AWS IAM instance pofile to assign to each control plane replica.",
},

"subnet_ids": {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "Required. The list of subnets where control plane replicas will run. A replica will be provisioned on each subnet and up to three values can be provided. Each subnet must be in a different AWS Availability Zone (AZ).",
Description: "The list of subnets where control plane replicas will run. A replica will be provisioned on each subnet and up to three values can be provided. Each subnet must be in a different AWS Availability Zone (AZ).",
Elem: &schema.Schema{Type: schema.TypeString},
},

"version": {
Type: schema.TypeString,
Required: true,
Description: "Required. The Kubernetes version to run on control plane replicas (e.g. `1.19.10-gke.1000`). You can list all supported versions on a given Google Cloud region by calling .",
Description: "The Kubernetes version to run on control plane replicas (e.g. `1.19.10-gke.1000`). You can list all supported versions on a given Google Cloud region by calling .",
},

"instance_type": {
Type: schema.TypeString,
Computed: true,
Optional: true,
Description: "Optional. The AWS instance type. When unspecified, it defaults to `t3.medium`.",
Description: "Optional. The AWS instance type. When unspecified, it defaults to `m5.large`.",
},

"main_volume": {
Expand Down Expand Up @@ -315,7 +315,7 @@ func ContainerAwsClusterControlPlaneAwsServicesAuthenticationSchema() *schema.Re
"role_arn": {
Type: schema.TypeString,
Required: true,
Description: "Required. The Amazon Resource Name (ARN) of the role that the Anthos Multi-Cloud API will assume when managing AWS resources on your account.",
Description: "The Amazon Resource Name (ARN) of the role that the Anthos Multi-Cloud API will assume when managing AWS resources on your account.",
},

"role_session_name": {
Expand All @@ -334,7 +334,7 @@ func ContainerAwsClusterControlPlaneConfigEncryptionSchema() *schema.Resource {
"kms_key_arn": {
Type: schema.TypeString,
Required: true,
Description: "Required. The ARN of the AWS KMS key used to encrypt cluster configuration.",
Description: "The ARN of the AWS KMS key used to encrypt cluster configuration.",
},
},
}
Expand All @@ -347,7 +347,7 @@ func ContainerAwsClusterControlPlaneDatabaseEncryptionSchema() *schema.Resource
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The ARN of the AWS KMS key used to encrypt cluster secrets.",
Description: "The ARN of the AWS KMS key used to encrypt cluster secrets.",
},
},
}
Expand Down Expand Up @@ -448,7 +448,7 @@ func ContainerAwsClusterControlPlaneSshConfigSchema() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The name of the EC2 key pair used to login into cluster machines.",
Description: "The name of the EC2 key pair used to login into cluster machines.",
},
},
}
Expand Down Expand Up @@ -482,23 +482,23 @@ func ContainerAwsClusterNetworkingSchema() *schema.Resource {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "Required. All pods in the cluster are assigned an RFC1918 IPv4 address from these ranges. Only a single range is supported. This field cannot be changed after creation.",
Description: "All pods in the cluster are assigned an RFC1918 IPv4 address from these ranges. Only a single range is supported. This field cannot be changed after creation.",
Elem: &schema.Schema{Type: schema.TypeString},
},

"service_address_cidr_blocks": {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "Required. All services in the cluster are assigned an RFC1918 IPv4 address from these ranges. Only a single range is supported. This field cannot be changed after creation.",
Description: "All services in the cluster are assigned an RFC1918 IPv4 address from these ranges. Only a single range is supported. This field cannot be changed after creation.",
Elem: &schema.Schema{Type: schema.TypeString},
},

"vpc_id": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The VPC associated with the cluster. All component clusters (i.e. control plane and node pools) run on a single VPC. This field cannot be changed after creation.",
Description: "The VPC associated with the cluster. All component clusters (i.e. control plane and node pools) run on a single VPC. This field cannot be changed after creation.",
},
},
}
Expand Down
32 changes: 16 additions & 16 deletions google-beta/resource_container_aws_node_pool.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func resourceContainerAwsNodePool() *schema.Resource {
"autoscaling": {
Type: schema.TypeList,
Required: true,
Description: "Required. Autoscaler configuration for this node pool.",
Description: "Autoscaler configuration for this node pool.",
MaxItems: 1,
Elem: ContainerAwsNodePoolAutoscalingSchema(),
},
Expand All @@ -64,7 +64,7 @@ func resourceContainerAwsNodePool() *schema.Resource {
"config": {
Type: schema.TypeList,
Required: true,
Description: "Required. The configuration of the node pool.",
Description: "The configuration of the node pool.",
MaxItems: 1,
Elem: ContainerAwsNodePoolConfigSchema(),
},
Expand All @@ -80,7 +80,7 @@ func resourceContainerAwsNodePool() *schema.Resource {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "Required. The constraint on the maximum number of pods that can be run simultaneously on a node in the node pool.",
Description: "The constraint on the maximum number of pods that can be run simultaneously on a node in the node pool.",
MaxItems: 1,
Elem: ContainerAwsNodePoolMaxPodsConstraintSchema(),
},
Expand All @@ -96,13 +96,13 @@ func resourceContainerAwsNodePool() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The subnet where the node pool node run.",
Description: "The subnet where the node pool node run.",
},

"version": {
Type: schema.TypeString,
Required: true,
Description: "Required. The Kubernetes version to run on this node pool (e.g. `1.19.10-gke.1000`). You can list all supported versions on a given Google Cloud region by calling GetAwsServerConfig.",
Description: "The Kubernetes version to run on this node pool (e.g. `1.19.10-gke.1000`). You can list all supported versions on a given Google Cloud region by calling GetAwsServerConfig.",
},

"annotations": {
Expand Down Expand Up @@ -166,13 +166,13 @@ func ContainerAwsNodePoolAutoscalingSchema() *schema.Resource {
"max_node_count": {
Type: schema.TypeInt,
Required: true,
Description: "Required. Maximum number of nodes in the NodePool. Must be >= min_node_count.",
Description: "Maximum number of nodes in the NodePool. Must be >= min_node_count.",
},

"min_node_count": {
Type: schema.TypeInt,
Required: true,
Description: "Required. Minimum number of nodes in the NodePool. Must be >= 1 and <= max_node_count.",
Description: "Minimum number of nodes in the NodePool. Must be >= 1 and <= max_node_count.",
},
},
}
Expand All @@ -184,7 +184,7 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
"config_encryption": {
Type: schema.TypeList,
Required: true,
Description: "Required. The ARN of the AWS KMS key used to encrypt node pool configuration.",
Description: "The ARN of the AWS KMS key used to encrypt node pool configuration.",
MaxItems: 1,
Elem: ContainerAwsNodePoolConfigConfigEncryptionSchema(),
},
Expand All @@ -193,15 +193,15 @@ func ContainerAwsNodePoolConfigSchema() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The name of the AWS IAM role assigned to nodes in the pool.",
Description: "The name of the AWS IAM role assigned to nodes in the pool.",
},

"instance_type": {
Type: schema.TypeString,
Computed: true,
Optional: true,
ForceNew: true,
Description: "Optional. The AWS instance type. When unspecified, it defaults to `t3.medium`.",
Description: "Optional. The AWS instance type. When unspecified, it defaults to `m5.large`.",
},

"labels": {
Expand Down Expand Up @@ -262,7 +262,7 @@ func ContainerAwsNodePoolConfigConfigEncryptionSchema() *schema.Resource {
"kms_key_arn": {
Type: schema.TypeString,
Required: true,
Description: "Required. The ARN of the AWS KMS key used to encrypt node pool configuration.",
Description: "The ARN of the AWS KMS key used to encrypt node pool configuration.",
},
},
}
Expand Down Expand Up @@ -308,7 +308,7 @@ func ContainerAwsNodePoolConfigSshConfigSchema() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The name of the EC2 key pair used to login into cluster machines.",
Description: "The name of the EC2 key pair used to login into cluster machines.",
},
},
}
Expand All @@ -321,21 +321,21 @@ func ContainerAwsNodePoolConfigTaintsSchema() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The taint effect. Possible values: EFFECT_UNSPECIFIED, NO_SCHEDULE, PREFER_NO_SCHEDULE, NO_EXECUTE",
Description: "The taint effect. Possible values: EFFECT_UNSPECIFIED, NO_SCHEDULE, PREFER_NO_SCHEDULE, NO_EXECUTE",
},

"key": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. Key for the taint.",
Description: "Key for the taint.",
},

"value": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. Value for the taint.",
Description: "Value for the taint.",
},
},
}
Expand All @@ -348,7 +348,7 @@ func ContainerAwsNodePoolMaxPodsConstraintSchema() *schema.Resource {
Type: schema.TypeInt,
Required: true,
ForceNew: true,
Description: "Required. The maximum number of pods to schedule on a single node.",
Description: "The maximum number of pods to schedule on a single node.",
},
},
}
Expand Down
4 changes: 2 additions & 2 deletions google-beta/resource_container_azure_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func resourceContainerAzureClient() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The Azure Active Directory Application ID.",
Description: "The Azure Active Directory Application ID.",
},

"location": {
Expand All @@ -68,7 +68,7 @@ func resourceContainerAzureClient() *schema.Resource {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "Required. The Azure Active Directory Tenant ID.",
Description: "The Azure Active Directory Tenant ID.",
},

"project": {
Expand Down