Skip to content

Commit 3a3ce81

Browse files
Update CustomTargetType resource to include googleCloudBuildRepo type (#10543) (#2228)
[upstream:121ec509180d23b0bdda2f44349261454ada20d0] Signed-off-by: Modular Magician <[email protected]>
1 parent 88a37a1 commit 3a3ce81

File tree

3 files changed

+55
-3
lines changed

3 files changed

+55
-3
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/hashicorp/hcl/v2 v2.19.1
1212
github.com/hashicorp/terraform-json v0.21.0
1313
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
14-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240507160734-75962a883935
14+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240507211440-cea8cd80ebc5
1515
github.com/mitchellh/go-homedir v1.1.0 // indirect
1616
github.com/pkg/errors v0.9.1
1717
github.com/stretchr/testify v1.9.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ github.com/hashicorp/terraform-plugin-mux v0.15.0 h1:+/+lDx0WUsIOpkAmdwBIoFU8UP9
184184
github.com/hashicorp/terraform-plugin-mux v0.15.0/go.mod h1:9ezplb1Dyq394zQ+ldB0nvy/qbNAz3mMoHHseMTMaKo=
185185
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0 h1:qHprzXy/As0rxedphECBEQAh3R4yp6pKksKHcqZx5G8=
186186
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0/go.mod h1:H+8tjs9TjV2w57QFVSMBQacf8k/E1XwLXGCARgViC6A=
187-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240507160734-75962a883935 h1:hUDsBHDFbx4tzF2fZ0X/f5LCH06WfwOvdPQMm9vcr/Y=
188-
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240507160734-75962a883935/go.mod h1:x4MXkCqqmNxtWirTL7SFXxIX+nOnI7K8/XjaNvpW43Q=
187+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240507211440-cea8cd80ebc5 h1:FicVN0+JGzVW9RJMDr9S6qKTRxtxCudZRu22L3tGU5o=
188+
github.com/hashicorp/terraform-provider-google-beta v1.20.1-0.20240507211440-cea8cd80ebc5/go.mod h1:x4MXkCqqmNxtWirTL7SFXxIX+nOnI7K8/XjaNvpW43Q=
189189
github.com/hashicorp/terraform-registry-address v0.2.3 h1:2TAiKJ1A3MAkZlH1YI/aTVcLZRu7JseiXNRHbOAyoTI=
190190
github.com/hashicorp/terraform-registry-address v0.2.3/go.mod h1:lFHA76T8jfQteVfT7caREqguFrW3c4MFSPhZB7HHgUM=
191191
github.com/hashicorp/terraform-svchost v0.1.1 h1:EZZimZ1GxdqFRinZ1tpJwVxxt49xc/S52uzrw4x0jKQ=

tfplan2cai/converters/google/resources/services/clouddeploy/clouddeploy_custom_target_type.go

+52
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,13 @@ func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModules(v inte
158158
transformed["googleCloudStorage"] = transformedGoogleCloudStorage
159159
}
160160

161+
transformedGoogleCloudBuildRepo, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepo(original["google_cloud_build_repo"], d, config)
162+
if err != nil {
163+
return nil, err
164+
} else if val := reflect.ValueOf(transformedGoogleCloudBuildRepo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
165+
transformed["googleCloudBuildRepo"] = transformedGoogleCloudBuildRepo
166+
}
167+
161168
req = append(req, transformed)
162169
}
163170
return req, nil
@@ -246,6 +253,51 @@ func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleC
246253
return v, nil
247254
}
248255

256+
func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
257+
l := v.([]interface{})
258+
if len(l) == 0 || l[0] == nil {
259+
return nil, nil
260+
}
261+
raw := l[0]
262+
original := raw.(map[string]interface{})
263+
transformed := make(map[string]interface{})
264+
265+
transformedRepository, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRepository(original["repository"], d, config)
266+
if err != nil {
267+
return nil, err
268+
} else if val := reflect.ValueOf(transformedRepository); val.IsValid() && !tpgresource.IsEmptyValue(val) {
269+
transformed["repository"] = transformedRepository
270+
}
271+
272+
transformedPath, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoPath(original["path"], d, config)
273+
if err != nil {
274+
return nil, err
275+
} else if val := reflect.ValueOf(transformedPath); val.IsValid() && !tpgresource.IsEmptyValue(val) {
276+
transformed["path"] = transformedPath
277+
}
278+
279+
transformedRef, err := expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRef(original["ref"], d, config)
280+
if err != nil {
281+
return nil, err
282+
} else if val := reflect.ValueOf(transformedRef); val.IsValid() && !tpgresource.IsEmptyValue(val) {
283+
transformed["ref"] = transformedRef
284+
}
285+
286+
return transformed, nil
287+
}
288+
289+
func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRepository(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
290+
return v, nil
291+
}
292+
293+
func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoPath(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
294+
return v, nil
295+
}
296+
297+
func expandClouddeployCustomTargetTypeCustomActionsIncludeSkaffoldModulesGoogleCloudBuildRepoRef(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
298+
return v, nil
299+
}
300+
249301
func expandClouddeployCustomTargetTypeEffectiveAnnotations(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
250302
if v == nil {
251303
return map[string]string{}, nil

0 commit comments

Comments
 (0)