Skip to content

Commit 7d64488

Browse files
fix permadiff by reading empty docker_config field (#10113) (#7044)
[upstream:c4d1efa32fa9aec82c1951a596f115b2ac443d88] Signed-off-by: Modular Magician <[email protected]>
1 parent 0a10dad commit 7d64488

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.changelog/10113.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
artifactregistry: fixed docker_config permadiff
3+
```

google-beta/services/artifactregistry/resource_artifact_registry_repository.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1079,9 +1079,6 @@ func flattenArtifactRegistryRepositoryDockerConfig(v interface{}, d *schema.Reso
10791079
return nil
10801080
}
10811081
original := v.(map[string]interface{})
1082-
if len(original) == 0 {
1083-
return nil
1084-
}
10851082
transformed := make(map[string]interface{})
10861083
transformed["immutable_tags"] =
10871084
flattenArtifactRegistryRepositoryDockerConfigImmutableTags(original["immutableTags"], d, config)
@@ -1525,9 +1522,14 @@ func expandArtifactRegistryRepositoryKmsKeyName(v interface{}, d tpgresource.Ter
15251522

15261523
func expandArtifactRegistryRepositoryDockerConfig(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) {
15271524
l := v.([]interface{})
1528-
if len(l) == 0 || l[0] == nil {
1525+
if len(l) == 0 {
15291526
return nil, nil
15301527
}
1528+
1529+
if l[0] == nil {
1530+
transformed := make(map[string]interface{})
1531+
return transformed, nil
1532+
}
15311533
raw := l[0]
15321534
original := raw.(map[string]interface{})
15331535
transformed := make(map[string]interface{})

0 commit comments

Comments
 (0)