Skip to content

Commit 6859b0c

Browse files
artifactregistry: added registry_uri as attribute to google_artifact_registry_repository (#14776) (#24164)
[upstream:ff3aee6739aaa87c30f819fc1df1ce929f9e402a] Signed-off-by: Modular Magician <[email protected]>
1 parent eda36c9 commit 6859b0c

File tree

4 files changed

+38
-0
lines changed

4 files changed

+38
-0
lines changed

.changelog/14776.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
```release-note:enhancement
2+
artifactregistry: added `registry_uri` as attribute to `google_artifact_registry_repository`
3+
```
4+
5+
**Tests:**
6+
7+
```
8+
make testacc TEST=./google/services/artifactregistry TESTARGS='-run=TestAccArtifactRegistryRepository_update'
9+
10+
.TF_ACC=1 TF_SCHEMA_PANIC_ON_ERROR=1 go test ./google/services/artifactregistry -v -run=TestAccArtifactRegistryRepository_update -timeout 240m -ldflags="-X=github.com/hashicorp/terraform-provider-google/version.ProviderVersion=acc"
11+
12+
=== RUN TestAccArtifactRegistryRepository_update
13+
=== PAUSE TestAccArtifactRegistryRepository_update
14+
=== RUN TestAccArtifactRegistryRepository_updateEmptyMvn
15+
=== PAUSE TestAccArtifactRegistryRepository_updateEmptyMvn
16+
=== CONT TestAccArtifactRegistryRepository_update
17+
=== CONT TestAccArtifactRegistryRepository_updateEmptyMvn
18+
--- PASS: TestAccArtifactRegistryRepository_update (16.29s)
19+
--- PASS: TestAccArtifactRegistryRepository_updateEmptyMvn (25.40s)
20+
PASS
21+
ok github.com/hashicorp/terraform-provider-google/google/services/artifactregistry 26.147s
22+
```

google/services/artifactregistry/resource_artifact_registry_repository.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,11 @@ Repository. Upstream policies cannot be set on a standard repository.`,
804804
Description: `The name of the repository, for example:
805805
"repo1"`,
806806
},
807+
"registry_uri": {
808+
Type: schema.TypeString,
809+
Computed: true,
810+
Description: `The repository endpoint, for example: us-docker.pkg.dev/my-proj/my-repo.`,
811+
},
807812
"terraform_labels": {
808813
Type: schema.TypeMap,
809814
Computed: true,
@@ -1023,6 +1028,9 @@ func resourceArtifactRegistryRepositoryRead(d *schema.ResourceData, meta interfa
10231028
if err := d.Set("labels", flattenArtifactRegistryRepositoryLabels(res["labels"], d, config)); err != nil {
10241029
return fmt.Errorf("Error reading Repository: %s", err)
10251030
}
1031+
if err := d.Set("registry_uri", flattenArtifactRegistryRepositoryRegistryUri(res["registryUri"], d, config)); err != nil {
1032+
return fmt.Errorf("Error reading Repository: %s", err)
1033+
}
10261034
if err := d.Set("kms_key_name", flattenArtifactRegistryRepositoryKmsKeyName(res["kmsKeyName"], d, config)); err != nil {
10271035
return fmt.Errorf("Error reading Repository: %s", err)
10281036
}
@@ -1318,6 +1326,10 @@ func flattenArtifactRegistryRepositoryLabels(v interface{}, d *schema.ResourceDa
13181326
return transformed
13191327
}
13201328

1329+
func flattenArtifactRegistryRepositoryRegistryUri(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
1330+
return v
1331+
}
1332+
13211333
func flattenArtifactRegistryRepositoryKmsKeyName(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
13221334
return v
13231335
}

google/services/artifactregistry/resource_artifact_registry_repository_generated_meta.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ fields:
2929
- field: 'maven_config.version_policy'
3030
- field: 'mode'
3131
- field: 'name'
32+
- field: 'registry_uri'
3233
- field: 'remote_repository_config.apt_repository.public_repository.repository_base'
3334
- field: 'remote_repository_config.apt_repository.public_repository.repository_path'
3435
- field: 'remote_repository_config.common_repository.uri'

website/docs/r/artifact_registry_repository.html.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,9 @@ In addition to the arguments listed above, the following computed attributes are
11001100
The name of the repository, for example:
11011101
"repo1"
11021102

1103+
* `registry_uri` -
1104+
The repository endpoint, for example: us-docker.pkg.dev/my-proj/my-repo.
1105+
11031106
* `create_time` -
11041107
The time when the repository was created.
11051108

0 commit comments

Comments
 (0)