Skip to content

Commit

Permalink
Add Dataplex Zone resource (#6075) (#12146)
Browse files Browse the repository at this point in the history
* Add Dataplex Zone resource

* Fix zone name

* Update DCL to 1.10.2

* run make upgrade-dcl

* Update DCL to v1.15.1

* run make upgrade

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Jul 20, 2022
1 parent 6937861 commit 82898ab
Show file tree
Hide file tree
Showing 8 changed files with 1,097 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .changelog/6075.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
`google_dataplex_zone`
```
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/hashicorp/terraform-provider-google
require (
cloud.google.com/go/bigtable v1.13.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.14.4
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1
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
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1516,5 +1516,7 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.14.4 h1:CxVWVPoWru9OCIUYJRUgH7jNWaZZlKBy8RdG8qbn1vU=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.14.4/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1 h1:ex2UFZoVSbfsHK0zDsilMpXXs1vBDwi2wk1Fxd5N3D0=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1 h1:ex2UFZoVSbfsHK0zDsilMpXXs1vBDwi2wk1Fxd5N3D0=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.15.1/go.mod h1:i6Pmzp7aolLmJY86RaJ9wjqm/HFleMeN7Vl5uIWLwE8=
1 change: 1 addition & 0 deletions google/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -1325,6 +1325,7 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
"google_container_azure_cluster": resourceContainerAzureCluster(),
"google_container_azure_node_pool": resourceContainerAzureNodePool(),
"google_dataplex_lake": resourceDataplexLake(),
"google_dataplex_zone": resourceDataplexZone(),
"google_dataproc_workflow_template": resourceDataprocWorkflowTemplate(),
"google_eventarc_trigger": resourceEventarcTrigger(),
"google_firebaserules_release": resourceFirebaserulesRelease(),
Expand Down
6 changes: 0 additions & 6 deletions google/resource_container_azure_node_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func resourceContainerAzureNodePool() *schema.Resource {
"autoscaling": {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "Autoscaler configuration for this node pool.",
MaxItems: 1,
Elem: ContainerAzureNodePoolAutoscalingSchema(),
Expand All @@ -65,7 +64,6 @@ func resourceContainerAzureNodePool() *schema.Resource {
"config": {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "The node configuration of the node pool.",
MaxItems: 1,
Elem: ContainerAzureNodePoolConfigSchema(),
Expand Down Expand Up @@ -176,14 +174,12 @@ func ContainerAzureNodePoolAutoscalingSchema() *schema.Resource {
"max_node_count": {
Type: schema.TypeInt,
Required: true,
ForceNew: true,
Description: "Maximum number of nodes in the node pool. Must be >= min_node_count.",
},

"min_node_count": {
Type: schema.TypeInt,
Required: true,
ForceNew: true,
Description: "Minimum number of nodes in the node pool. Must be >= 1 and <= max_node_count.",
},
},
Expand All @@ -196,7 +192,6 @@ func ContainerAzureNodePoolConfigSchema() *schema.Resource {
"ssh_config": {
Type: schema.TypeList,
Required: true,
ForceNew: true,
Description: "SSH configuration for how to access the node pool machines.",
MaxItems: 1,
Elem: ContainerAzureNodePoolConfigSshConfigSchema(),
Expand Down Expand Up @@ -246,7 +241,6 @@ func ContainerAzureNodePoolConfigSshConfigSchema() *schema.Resource {
"authorized_key": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
Description: "The SSH public key data for VMs managed by Anthos. This accepts the authorized_keys file format used in OpenSSH according to the sshd(8) manual page.",
},
},
Expand Down
Loading

0 comments on commit 82898ab

Please sign in to comment.