Skip to content

Commit fbb0cf6

Browse files
authored
Merge pull request #1233 from blakeromano/firehose-arn-removal
Remove ARN Parameter from Firehose DeliveryStream Resource
2 parents ae4e4d3 + affd2a0 commit fbb0cf6

5 files changed

Lines changed: 16 additions & 37 deletions

File tree

apis/firehose/v1beta1/zz_deliverystream_types.go

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

apis/firehose/v1beta1/zz_generated.deepcopy.go

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

apis/firehose/v1beta1/zz_generated.resolvers.go

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

config/firehose/config.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,30 @@ func Configure(p *config.Provider) {
1717
r.TerraformResource.Schema["splunk_configuration"].Elem.(*schema.Resource).Schema["hec_token"].Sensitive = true
1818

1919
r.References["extended_s3_configuration.role_arn"] = config.Reference{
20-
Type: "github.com/upbound/provider-aws/apis/iam/v1beta1.Role",
21-
Extractor: common.PathARNExtractor,
20+
TerraformName: "aws_iam_role",
21+
Extractor: common.PathARNExtractor,
2222
}
2323
r.References["extended_s3_configuration.bucket_arn"] = config.Reference{
24-
Type: "github.com/upbound/provider-aws/apis/s3/v1beta1.Bucket",
25-
Extractor: common.PathARNExtractor,
24+
TerraformName: "aws_s3_bucket",
25+
Extractor: common.PathARNExtractor,
2626
}
2727

2828
r.References["s3_configuration.role_arn"] = config.Reference{
29-
Type: "github.com/upbound/provider-aws/apis/iam/v1beta1.Role",
30-
Extractor: common.PathARNExtractor,
29+
TerraformName: "aws_iam_role",
30+
Extractor: common.PathARNExtractor,
3131
}
3232
r.References["s3_configuration.bucket_arn"] = config.Reference{
33-
Type: "github.com/upbound/provider-aws/apis/s3/v1beta1.Bucket",
34-
Extractor: common.PathARNExtractor,
33+
TerraformName: "aws_s3_bucket",
34+
Extractor: common.PathARNExtractor,
3535
}
3636

3737
r.References["redshift_configuration.s3_backup_configuration.bucket_arn"] = config.Reference{
38-
Type: "github.com/upbound/provider-aws/apis/s3/v1beta1.Bucket",
39-
Extractor: `github.com/crossplane/upjet/pkg/resource.ExtractParamPath("arn",true)`,
38+
TerraformName: "aws_s3_bucket",
39+
Extractor: common.PathARNExtractor,
4040
}
4141

42+
config.MoveToStatus(r.TerraformResource, "arn")
43+
4244
r.LateInitializer = config.LateInitializer{
4345
IgnoredFields: []string{
4446
"server_side_encryption",

package/crds/firehose.aws.upbound.io_deliverystreams.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ spec:
7373
type: string
7474
forProvider:
7575
properties:
76-
arn:
77-
description: The Amazon Resource Name (ARN) specifying the Stream
78-
type: string
7976
destination:
8077
description: – This is the destination to where the data is delivered.
8178
The only options are s3 (Deprecated, use extended_s3 instead),
@@ -4158,9 +4155,6 @@ spec:
41584155
for example because of an external controller is managing them, like an
41594156
autoscaler.
41604157
properties:
4161-
arn:
4162-
description: The Amazon Resource Name (ARN) specifying the Stream
4163-
type: string
41644158
destination:
41654159
description: – This is the destination to where the data is delivered.
41664160
The only options are s3 (Deprecated, use extended_s3 instead),

0 commit comments

Comments
 (0)