Skip to content

Commit 6749844

Browse files
iyabcheniyabchen
committed
Create test project on the fly
1 parent 5223f89 commit 6749844

File tree

9 files changed

+268
-367
lines changed

9 files changed

+268
-367
lines changed

‎config-test-project.sh

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
#!/bin/bash
2+
set -ex
3+
4+
TF_CONFIG_FILE="tf-dev-override.tfrc"
5+
TEST_ORG_ID="319236962101"
6+
7+
# setup
8+
mkdir -p tf-workspace
9+
pushd tf-workspace
10+
cat <<EOF > project_create.tf
11+
12+
resource "random_string" "suffix" {
13+
length = 10
14+
upper = false
15+
special = false
16+
}
17+
18+
resource "google_folder" "test-folder" {
19+
display_name = "test-folder-\${random_string.suffix.result}"
20+
parent = "organizations/$TEST_ORG_ID"
21+
}
22+
23+
resource "google_project" "test-project" {
24+
folder_id = google_folder.test-folder.name
25+
name = "My Project ${random_string.suffix.result}"
26+
project_id = "test-project-\${random_string.suffix.result}"
27+
}
28+
EOF
29+
30+
terraform plan
31+
terraform apply -auto-approve
32+
33+
# fetch IDs
34+
TEST_FOLDER_ID=`terraform show -json terraform.tfstate | jq -r '.values.root_module.resources[] | select(.type=="google_project") | .values.folder_id'`
35+
36+
TEST_PROJECT=`terraform show -json terraform.tfstate | jq -r '.values.root_module.resources[] | select(.type=="google_project") | .values.project_id'`
37+
popd
38+
39+
TEST_ANCESTRY="organizations/$TEST_ORG_ID/folder/$TEST_FOLDER_ID"
40+
41+
popd
42+
43+
44+
go clean --modcache
45+
go list -json -m github.com/hashicorp/terraform-provider-google-beta
46+
REPLACE_DIR=`go list -json -m github.com/hashicorp/terraform-provider-google-beta | jq -r '.Dir // empty'`
47+
VERSION=`go list -json -m github.com/hashicorp/terraform-provider-google-beta | jq -r .Version`
48+
49+
if [ ! -z "$REPLACE_DIR" ]
50+
then
51+
# for tests triggered by magic-module CI which replaces tpgb module
52+
pushd $REPLACE_DIR
53+
go install
54+
popd
55+
else
56+
# for tests triggered in tgc CI
57+
go install github.com/hashicorp/terraform-provider-google-beta@$VERSION
58+
fi
59+
60+
# create terraform configuration file
61+
if ! [ -f $TF_CONFIG_FILE ];then
62+
cat <<EOF > $TF_CONFIG_FILE
63+
provider_installation {
64+
# Developer overrides will stop Terraform from downloading the listed
65+
# providers their origin provider registries.
66+
dev_overrides {
67+
"hashicorp/google-beta" = "$GOPATH/bin"
68+
}
69+
# For all other providers, install them directly from their origin provider
70+
# registries as normal. If you omit this, Terraform will _only_ use
71+
# the dev_overrides block, and so no other providers will be available.
72+
# Without this, show "Failed to query available provider packages"
73+
# at terraform init
74+
direct{}
75+
}
76+
EOF
77+
fi
78+
79+
# cleanup
80+
popd
81+
82+
83+
terraform destroy
84+
popd

‎tfplan2cai/converters/google/resources/services/gkehub2/gkehub2_feature.go

-289
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,6 @@ func GetGKEHub2FeatureApiObject(d tpgresource.TerraformResourceData, config *tra
6060
} else if v, ok := d.GetOkExists("spec"); !tpgresource.IsEmptyValue(reflect.ValueOf(specProp)) && (ok || !reflect.DeepEqual(v, specProp)) {
6161
obj["spec"] = specProp
6262
}
63-
fleetDefaultMemberConfigProp, err := expandGKEHub2FeatureFleetDefaultMemberConfig(d.Get("fleet_default_member_config"), d, config)
64-
if err != nil {
65-
return nil, err
66-
} else if v, ok := d.GetOkExists("fleet_default_member_config"); !tpgresource.IsEmptyValue(reflect.ValueOf(fleetDefaultMemberConfigProp)) && (ok || !reflect.DeepEqual(v, fleetDefaultMemberConfigProp)) {
67-
obj["fleetDefaultMemberConfig"] = fleetDefaultMemberConfigProp
68-
}
6963
labelsProp, err := expandGKEHub2FeatureEffectiveLabels(d.Get("effective_labels"), d, config)
7064
if err != nil {
7165
return nil, err
@@ -216,289 +210,6 @@ func expandGKEHub2FeatureSpecFleetobservabilityLoggingConfigFleetScopeLogsConfig
216210
return v, nil
217211
}
218212

219-
func expandGKEHub2FeatureFleetDefaultMemberConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
220-
l := v.([]interface{})
221-
if len(l) == 0 || l[0] == nil {
222-
return nil, nil
223-
}
224-
raw := l[0]
225-
original := raw.(map[string]interface{})
226-
transformed := make(map[string]interface{})
227-
228-
transformedMesh, err := expandGKEHub2FeatureFleetDefaultMemberConfigMesh(original["mesh"], d, config)
229-
if err != nil {
230-
return nil, err
231-
} else if val := reflect.ValueOf(transformedMesh); val.IsValid() && !tpgresource.IsEmptyValue(val) {
232-
transformed["mesh"] = transformedMesh
233-
}
234-
235-
transformedConfigmanagement, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagement(original["configmanagement"], d, config)
236-
if err != nil {
237-
return nil, err
238-
} else if val := reflect.ValueOf(transformedConfigmanagement); val.IsValid() && !tpgresource.IsEmptyValue(val) {
239-
transformed["configmanagement"] = transformedConfigmanagement
240-
}
241-
242-
return transformed, nil
243-
}
244-
245-
func expandGKEHub2FeatureFleetDefaultMemberConfigMesh(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
246-
l := v.([]interface{})
247-
if len(l) == 0 || l[0] == nil {
248-
return nil, nil
249-
}
250-
raw := l[0]
251-
original := raw.(map[string]interface{})
252-
transformed := make(map[string]interface{})
253-
254-
transformedManagement, err := expandGKEHub2FeatureFleetDefaultMemberConfigMeshManagement(original["management"], d, config)
255-
if err != nil {
256-
return nil, err
257-
} else if val := reflect.ValueOf(transformedManagement); val.IsValid() && !tpgresource.IsEmptyValue(val) {
258-
transformed["management"] = transformedManagement
259-
}
260-
261-
return transformed, nil
262-
}
263-
264-
func expandGKEHub2FeatureFleetDefaultMemberConfigMeshManagement(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
265-
return v, nil
266-
}
267-
268-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagement(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
269-
l := v.([]interface{})
270-
if len(l) == 0 || l[0] == nil {
271-
return nil, nil
272-
}
273-
raw := l[0]
274-
original := raw.(map[string]interface{})
275-
transformed := make(map[string]interface{})
276-
277-
transformedConfigSync, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSync(original["config_sync"], d, config)
278-
if err != nil {
279-
return nil, err
280-
} else if val := reflect.ValueOf(transformedConfigSync); val.IsValid() && !tpgresource.IsEmptyValue(val) {
281-
transformed["configSync"] = transformedConfigSync
282-
}
283-
284-
return transformed, nil
285-
}
286-
287-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSync(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
288-
l := v.([]interface{})
289-
if len(l) == 0 || l[0] == nil {
290-
return nil, nil
291-
}
292-
raw := l[0]
293-
original := raw.(map[string]interface{})
294-
transformed := make(map[string]interface{})
295-
296-
transformedSourceFormat, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncSourceFormat(original["source_format"], d, config)
297-
if err != nil {
298-
return nil, err
299-
} else if val := reflect.ValueOf(transformedSourceFormat); val.IsValid() && !tpgresource.IsEmptyValue(val) {
300-
transformed["sourceFormat"] = transformedSourceFormat
301-
}
302-
303-
transformedGit, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGit(original["git"], d, config)
304-
if err != nil {
305-
return nil, err
306-
} else if val := reflect.ValueOf(transformedGit); val.IsValid() && !tpgresource.IsEmptyValue(val) {
307-
transformed["git"] = transformedGit
308-
}
309-
310-
transformedOci, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOci(original["oci"], d, config)
311-
if err != nil {
312-
return nil, err
313-
} else if val := reflect.ValueOf(transformedOci); val.IsValid() && !tpgresource.IsEmptyValue(val) {
314-
transformed["oci"] = transformedOci
315-
}
316-
317-
return transformed, nil
318-
}
319-
320-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncSourceFormat(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
321-
return v, nil
322-
}
323-
324-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGit(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
325-
l := v.([]interface{})
326-
if len(l) == 0 || l[0] == nil {
327-
return nil, nil
328-
}
329-
raw := l[0]
330-
original := raw.(map[string]interface{})
331-
transformed := make(map[string]interface{})
332-
333-
transformedSyncRepo, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncRepo(original["sync_repo"], d, config)
334-
if err != nil {
335-
return nil, err
336-
} else if val := reflect.ValueOf(transformedSyncRepo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
337-
transformed["syncRepo"] = transformedSyncRepo
338-
}
339-
340-
transformedSyncBranch, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncBranch(original["sync_branch"], d, config)
341-
if err != nil {
342-
return nil, err
343-
} else if val := reflect.ValueOf(transformedSyncBranch); val.IsValid() && !tpgresource.IsEmptyValue(val) {
344-
transformed["syncBranch"] = transformedSyncBranch
345-
}
346-
347-
transformedPolicyDir, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitPolicyDir(original["policy_dir"], d, config)
348-
if err != nil {
349-
return nil, err
350-
} else if val := reflect.ValueOf(transformedPolicyDir); val.IsValid() && !tpgresource.IsEmptyValue(val) {
351-
transformed["policyDir"] = transformedPolicyDir
352-
}
353-
354-
transformedSyncRev, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncRev(original["sync_rev"], d, config)
355-
if err != nil {
356-
return nil, err
357-
} else if val := reflect.ValueOf(transformedSyncRev); val.IsValid() && !tpgresource.IsEmptyValue(val) {
358-
transformed["syncRev"] = transformedSyncRev
359-
}
360-
361-
transformedSecretType, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSecretType(original["secret_type"], d, config)
362-
if err != nil {
363-
return nil, err
364-
} else if val := reflect.ValueOf(transformedSecretType); val.IsValid() && !tpgresource.IsEmptyValue(val) {
365-
transformed["secretType"] = transformedSecretType
366-
}
367-
368-
transformedHttpsProxy, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitHttpsProxy(original["https_proxy"], d, config)
369-
if err != nil {
370-
return nil, err
371-
} else if val := reflect.ValueOf(transformedHttpsProxy); val.IsValid() && !tpgresource.IsEmptyValue(val) {
372-
transformed["httpsProxy"] = transformedHttpsProxy
373-
}
374-
375-
transformedGcpServiceAccountEmail, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitGcpServiceAccountEmail(original["gcp_service_account_email"], d, config)
376-
if err != nil {
377-
return nil, err
378-
} else if val := reflect.ValueOf(transformedGcpServiceAccountEmail); val.IsValid() && !tpgresource.IsEmptyValue(val) {
379-
transformed["gcpServiceAccountEmail"] = transformedGcpServiceAccountEmail
380-
}
381-
382-
transformedSyncWaitSecs, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncWaitSecs(original["sync_wait_secs"], d, config)
383-
if err != nil {
384-
return nil, err
385-
} else if val := reflect.ValueOf(transformedSyncWaitSecs); val.IsValid() && !tpgresource.IsEmptyValue(val) {
386-
transformed["syncWaitSecs"] = transformedSyncWaitSecs
387-
}
388-
389-
return transformed, nil
390-
}
391-
392-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncRepo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
393-
return v, nil
394-
}
395-
396-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncBranch(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
397-
return v, nil
398-
}
399-
400-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitPolicyDir(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
401-
return v, nil
402-
}
403-
404-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncRev(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
405-
return v, nil
406-
}
407-
408-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSecretType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
409-
return v, nil
410-
}
411-
412-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitHttpsProxy(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
413-
return v, nil
414-
}
415-
416-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitGcpServiceAccountEmail(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
417-
return v, nil
418-
}
419-
420-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncGitSyncWaitSecs(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
421-
return v, nil
422-
}
423-
424-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOci(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
425-
l := v.([]interface{})
426-
if len(l) == 0 || l[0] == nil {
427-
return nil, nil
428-
}
429-
raw := l[0]
430-
original := raw.(map[string]interface{})
431-
transformed := make(map[string]interface{})
432-
433-
transformedSyncRepo, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciSyncRepo(original["sync_repo"], d, config)
434-
if err != nil {
435-
return nil, err
436-
} else if val := reflect.ValueOf(transformedSyncRepo); val.IsValid() && !tpgresource.IsEmptyValue(val) {
437-
transformed["syncRepo"] = transformedSyncRepo
438-
}
439-
440-
transformedPolicyDir, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciPolicyDir(original["policy_dir"], d, config)
441-
if err != nil {
442-
return nil, err
443-
} else if val := reflect.ValueOf(transformedPolicyDir); val.IsValid() && !tpgresource.IsEmptyValue(val) {
444-
transformed["policyDir"] = transformedPolicyDir
445-
}
446-
447-
transformedSecretType, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciSecretType(original["secret_type"], d, config)
448-
if err != nil {
449-
return nil, err
450-
} else if val := reflect.ValueOf(transformedSecretType); val.IsValid() && !tpgresource.IsEmptyValue(val) {
451-
transformed["secretType"] = transformedSecretType
452-
}
453-
454-
transformedGcpServiceAccountEmail, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciGcpServiceAccountEmail(original["gcp_service_account_email"], d, config)
455-
if err != nil {
456-
return nil, err
457-
} else if val := reflect.ValueOf(transformedGcpServiceAccountEmail); val.IsValid() && !tpgresource.IsEmptyValue(val) {
458-
transformed["gcpServiceAccountEmail"] = transformedGcpServiceAccountEmail
459-
}
460-
461-
transformedSyncWaitSecs, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciSyncWaitSecs(original["sync_wait_secs"], d, config)
462-
if err != nil {
463-
return nil, err
464-
} else if val := reflect.ValueOf(transformedSyncWaitSecs); val.IsValid() && !tpgresource.IsEmptyValue(val) {
465-
transformed["syncWaitSecs"] = transformedSyncWaitSecs
466-
}
467-
468-
transformedVersion, err := expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciVersion(original["version"], d, config)
469-
if err != nil {
470-
return nil, err
471-
} else if val := reflect.ValueOf(transformedVersion); val.IsValid() && !tpgresource.IsEmptyValue(val) {
472-
transformed["version"] = transformedVersion
473-
}
474-
475-
return transformed, nil
476-
}
477-
478-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciSyncRepo(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
479-
return v, nil
480-
}
481-
482-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciPolicyDir(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
483-
return v, nil
484-
}
485-
486-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciSecretType(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
487-
return v, nil
488-
}
489-
490-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciGcpServiceAccountEmail(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
491-
return v, nil
492-
}
493-
494-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciSyncWaitSecs(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
495-
return v, nil
496-
}
497-
498-
func expandGKEHub2FeatureFleetDefaultMemberConfigConfigmanagementConfigSyncOciVersion(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
499-
return v, nil
500-
}
501-
502213
func expandGKEHub2FeatureEffectiveLabels(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]string, error) {
503214
if v == nil {
504215
return map[string]string{}, nil

0 commit comments

Comments
 (0)