Upgrade DCL to 1.67 (#10838) (hashicorp#7442)

[upstream:2c721b59725c7f9cc5a164d92e8418f397bbf46f] Signed-off-by: Modular Magician <[email protected]>
askubis · May 31, 2024 · 1a3b095 · 1a3b095
1 parent ebd2e1f
commit 1a3b095
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.21
 
 require (
 	cloud.google.com/go/bigtable v1.23.0
-	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.66.0
+	github.com/GoogleCloudPlatform/declarative-resource-client-library v1.67.0
 	github.com/apparentlymart/go-cidr v1.1.0
 	github.com/davecgh/go-spew v1.1.1
 	github.com/dnaeon/go-vcr v1.0.1

diff --git a/go.sum b/go.sum
@@ -18,8 +18,6 @@ cloud.google.com/go/longrunning v0.5.6/go.mod h1:vUaDrWYOMKRuhiv6JBnn49YxCPz2Ayn
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.66.0 h1:9C++tMcDcwgT8QTaq2bRtuAB5Tg4o4I4CkDQD57i914=
-github.com/GoogleCloudPlatform/declarative-resource-client-library v1.66.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/ProtonMail/go-crypto v1.1.0-alpha.0 h1:nHGfwXmFvJrSR9xu8qL7BkO4DqTHXE9N5vPhgY2I+j0=
@@ -430,3 +428,5 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.67.0 h1:FBKsgWIOEdtpx2YuF+aBH33K0Ih25D3xuKyp9peH4jc=
+github.com/GoogleCloudPlatform/declarative-resource-client-library v1.67.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_target.go b/google-beta/services/clouddeploy/resource_clouddeploy_target.go
@@ -275,6 +275,12 @@ func ClouddeployTargetExecutionConfigsSchema() *schema.Resource {
 				Description: "Optional. Google service account to use for execution. If unspecified, the project execution service account ([email protected]) is used.",
 			},
 
+			"verbose": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Description: "Optional. If true, additional logging will be enabled when running builds in this execution environment.",
+			},
+
 			"worker_pool": {
 				Type:             schema.TypeString,
 				Optional:         true,
@@ -712,6 +718,7 @@ func expandClouddeployTargetExecutionConfigs(o interface{}) *clouddeploy.TargetE
 		ArtifactStorage:  dcl.StringOrNil(obj["artifact_storage"].(string)),
 		ExecutionTimeout: dcl.StringOrNil(obj["execution_timeout"].(string)),
 		ServiceAccount:   dcl.StringOrNil(obj["service_account"].(string)),
+		Verbose:          dcl.Bool(obj["verbose"].(bool)),
 		WorkerPool:       dcl.String(obj["worker_pool"].(string)),
 	}
 }
@@ -739,6 +746,7 @@ func flattenClouddeployTargetExecutionConfigs(obj *clouddeploy.TargetExecutionCo
 		"artifact_storage":  obj.ArtifactStorage,
 		"execution_timeout": obj.ExecutionTimeout,
 		"service_account":   obj.ServiceAccount,
+		"verbose":           obj.Verbose,
 		"worker_pool":       obj.WorkerPool,
 	}
 

diff --git a/google-beta/services/clouddeploy/resource_clouddeploy_target_generated_test.go b/google-beta/services/clouddeploy/resource_clouddeploy_target_generated_test.go
@@ -473,6 +473,7 @@ resource "google_clouddeploy_target" "primary" {
     usages           = ["RENDER"]
     artifact_storage = "gs://other-bucket/other-dir"
     service_account  = "other-owner@%{project_name}.iam.gserviceaccount.com"
+    verbose          = true
   }
 
   execution_configs {

diff --git a/website/docs/r/clouddeploy_target.html.markdown b/website/docs/r/clouddeploy_target.html.markdown
@@ -232,6 +232,10 @@ The `execution_configs` block supports:
   (Required)
   Required. Usages when this configuration should be applied.
 
+* `verbose` -
+  (Optional)
+  Optional. If true, additional logging will be enabled when running builds in this execution environment.
+
 * `worker_pool` -
   (Optional)
   Optional. The resource name of the `WorkerPool`, with the format `projects/{project}/locations/{location}/workerPools/{worker_pool}`. If this optional field is unspecified, the default Cloud Build pool will be used.