Skip to content

Commit 57308b7

Browse files
authored
[v7]: cluster certificateAuthority only returns a single item (#5661)
Follow up to #5655. The upstream API only returns a single item so we should remove the list version not the single item version
1 parent 73d85b3 commit 57308b7

File tree

11 files changed

+122
-97
lines changed

11 files changed

+122
-97
lines changed

docs/version-7-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -712,7 +712,7 @@ Remove `resolveConflicts`—it is no longer supported. Use `resolveConflictsOnCr
712712

713713
## Resource `aws.eks.Cluster`
714714

715-
`certificateAuthority` is no longer supported. Use `certificateAuthorities` instead.
715+
`certificateAuthorities` is no longer supported. Use `certificateAuthority` instead.
716716

717717
## Resource `aws.elasticache.ReplicationGroup`
718718

provider/cmd/pulumi-resource-aws/bridge-metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12383,7 +12383,7 @@
1238312383
"maxItemsOne": true
1238412384
},
1238512385
"certificate_authority": {
12386-
"maxItemsOne": false
12386+
"maxItemsOne": true
1238712387
},
1238812388
"compute_config": {
1238912389
"maxItemsOne": true,

provider/cmd/pulumi-resource-aws/schema.json

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -276844,11 +276844,8 @@
276844276844
"type": "boolean",
276845276845
"description": "Install default unmanaged add-ons, such as `aws-cni`, `kube-proxy`, and CoreDNS during cluster creation. If `false`, you must manually install desired add-ons. Changing this value will force a new cluster to be created. Defaults to `true`.\n"
276846276846
},
276847-
"certificateAuthorities": {
276848-
"type": "array",
276849-
"items": {
276850-
"$ref": "#/types/aws:eks/ClusterCertificateAuthority:ClusterCertificateAuthority"
276851-
},
276847+
"certificateAuthority": {
276848+
"$ref": "#/types/aws:eks/ClusterCertificateAuthority:ClusterCertificateAuthority",
276852276849
"description": "Attribute block containing `certificate-authority-data` for your cluster. Detailed below.\n"
276853276850
},
276854276851
"clusterId": {
@@ -276959,7 +276956,7 @@
276959276956
"required": [
276960276957
"accessConfig",
276961276958
"arn",
276962-
"certificateAuthorities",
276959+
"certificateAuthority",
276963276960
"clusterId",
276964276961
"createdAt",
276965276962
"endpoint",
@@ -277079,11 +277076,8 @@
277079277076
"description": "Install default unmanaged add-ons, such as `aws-cni`, `kube-proxy`, and CoreDNS during cluster creation. If `false`, you must manually install desired add-ons. Changing this value will force a new cluster to be created. Defaults to `true`.\n",
277080277077
"willReplaceOnChanges": true
277081277078
},
277082-
"certificateAuthorities": {
277083-
"type": "array",
277084-
"items": {
277085-
"$ref": "#/types/aws:eks/ClusterCertificateAuthority:ClusterCertificateAuthority"
277086-
},
277079+
"certificateAuthority": {
277080+
"$ref": "#/types/aws:eks/ClusterCertificateAuthority:ClusterCertificateAuthority",
277087277081
"description": "Attribute block containing `certificate-authority-data` for your cluster. Detailed below.\n"
277088277082
},
277089277083
"clusterId": {

provider/resources.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,6 +2272,13 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
22722272
},
22732273
},
22742274
"aws_eks_cluster": {
2275+
Fields: map[string]*info.Schema{
2276+
"certificate_authority": {
2277+
Name: "certificateAuthority",
2278+
// The upstream API only returns a single item
2279+
MaxItemsOne: tfbridge.True(),
2280+
},
2281+
},
22752282
TransformFromState: func(_ context.Context, pm resource.PropertyMap) (resource.PropertyMap, error) {
22762283
// if the defaultOutboundAccessEnabled property is not set, set it to the default value of true
22772284
// this prevents an unnecessary replacement when upgrading the provider

sdk/dotnet/Eks/Cluster.cs

Lines changed: 4 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/go/aws/eks/cluster.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/go/aws/eks/pulumiTypes.go

Lines changed: 63 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sdk/java/src/main/java/com/pulumi/aws/eks/Cluster.java

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)