Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reimplement "mackerel_aws_integration" data source with terraform-plugin-framework #247

Merged
merged 6 commits into from
Nov 5, 2024
Merged

Reimplement "mackerel_aws_integration" data source with terraform-plugin-framework #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
df1ceaa
refactor: split AWSIntergrationServices
tosuke Oct 22, 2024
caf8d1c
feat: add model for data source
tosuke Oct 22, 2024
27994f0
feat: publish ReadAWSIntegration
tosuke Oct 22, 2024
97b413d
feat: reimplement mackerel_aws_integration data source
tosuke Oct 22, 2024
2faaac1
fix: each services has set type.
tosuke Oct 31, 2024
68f021b
fix: add missing sensitive flag
tosuke Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion internal/mackerel/aws_integration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,25 @@ type AWSIntegrationModel struct {
IncludedTags types.String `tfsdk:"included_tags"`
ExcludedTags types.String `tfsdk:"excluded_tags"`

AWSIntegrationSerfvices
}

type AWSIntegrationDataSourceModel struct {
ID types.String `tfsdk:"id"`
Name types.String `tfsdk:"name"`
Memo types.String `tfsdk:"memo"`
Key types.String `tfsdk:"key"`
SecretKey types.String `tfsdk:"-"`
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AWS Integration resources contain an AWS secret key in their state, whereas data sources do not.

RoleARN types.String `tfsdk:"role_arn"`
ExternalID types.String `tfsdk:"external_id"`
Region types.String `tfsdk:"region"`
IncludedTags types.String `tfsdk:"included_tags"`
ExcludedTags types.String `tfsdk:"excluded_tags"`

AWSIntegrationSerfvices
}

type AWSIntegrationSerfvices struct {
EC2 AWSIntegrationServiceWithRetireAutomaticallyOpt `tfsdk:"ec2"`
ELB AWSIntegrationServiceOpt `tfsdk:"elb"`
ALB AWSIntegrationServiceOpt `tfsdk:"alb"`
Expand Down Expand Up @@ -69,6 +88,10 @@ type AWSIntegrationServiceWithRetireAutomatically struct {

type AWSIntegrationServiceWithRetireAutomaticallyOpt []AWSIntegrationServiceWithRetireAutomatically // length <= 1

func ReadAWSIntegration(_ context.Context, client *Client, id string) (*AWSIntegrationModel, error) {
return readAWSIntegration(client, id)
}

func readAWSIntegration(client *Client, id string) (*AWSIntegrationModel, error) {
mackerelAWSIntegration, err := client.FindAWSIntegration(id)
if err != nil {
Expand Down Expand Up @@ -259,7 +282,7 @@ func (m *AWSIntegrationModel) merge(newModel AWSIntegrationModel) {
type awsServiceEachFunc func(name string, service *AWSIntegrationService) *AWSIntegrationService

// Iterates and updates over services by name
func (m *AWSIntegrationModel) each(fn awsServiceEachFunc) {
func (m *AWSIntegrationSerfvices) each(fn awsServiceEachFunc) {
m.EC2.each("EC2", fn)
m.ELB.each("ELB", fn)
m.ALB.each("ALB", fn)
Expand Down
208 changes: 106 additions & 102 deletions internal/mackerel/aws_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,57 +192,59 @@ func Test_AWSIntegration_fromAPI(t *testing.T) {
IncludedTags: types.StringValue("Name:production-server,Environment:production"),
ExcludedTags: types.StringValue("Name:staging-server,Environment:staging"),

EC2: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(true),
}},
ELB: []AWSIntegrationService{},
ALB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"alb.request.count", "alb.bytes.processed"},
RetireAutomatically: types.BoolValue(false),
}},
NLB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
RDS: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"rds.cpu.used"},
RetireAutomatically: types.BoolValue(false),
}},
Redshift: []AWSIntegrationService{},
ElastiCache: []AWSIntegrationServiceWithRetireAutomatically{},
SQS: []AWSIntegrationService{},
Lambda: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
DynamoDB: []AWSIntegrationService{},
CloudFront: []AWSIntegrationService{},
APIGateway: []AWSIntegrationService{},
Kinesis: []AWSIntegrationService{},
S3: []AWSIntegrationService{},
ES: []AWSIntegrationService{},
ECSCluster: []AWSIntegrationService{},
SES: []AWSIntegrationService{},
States: []AWSIntegrationService{},
EFS: []AWSIntegrationService{},
Firehose: []AWSIntegrationService{},
Batch: []AWSIntegrationService{},
WAF: []AWSIntegrationService{},
Billing: []AWSIntegrationService{},
Route53: []AWSIntegrationService{},
Connect: []AWSIntegrationService{},
DocDB: []AWSIntegrationService{},
CodeBuild: []AWSIntegrationService{},
AWSIntegrationSerfvices: AWSIntegrationSerfvices{
EC2: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(true),
}},
ELB: []AWSIntegrationService{},
ALB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"alb.request.count", "alb.bytes.processed"},
RetireAutomatically: types.BoolValue(false),
}},
NLB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
RDS: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"rds.cpu.used"},
RetireAutomatically: types.BoolValue(false),
}},
Redshift: []AWSIntegrationService{},
ElastiCache: []AWSIntegrationServiceWithRetireAutomatically{},
SQS: []AWSIntegrationService{},
Lambda: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
DynamoDB: []AWSIntegrationService{},
CloudFront: []AWSIntegrationService{},
APIGateway: []AWSIntegrationService{},
Kinesis: []AWSIntegrationService{},
S3: []AWSIntegrationService{},
ES: []AWSIntegrationService{},
ECSCluster: []AWSIntegrationService{},
SES: []AWSIntegrationService{},
States: []AWSIntegrationService{},
EFS: []AWSIntegrationService{},
Firehose: []AWSIntegrationService{},
Batch: []AWSIntegrationService{},
WAF: []AWSIntegrationService{},
Billing: []AWSIntegrationService{},
Route53: []AWSIntegrationService{},
Connect: []AWSIntegrationService{},
DocDB: []AWSIntegrationService{},
CodeBuild: []AWSIntegrationService{},
},
},
},
}
Expand Down Expand Up @@ -285,57 +287,59 @@ func Test_AWSIntegration_toAPI(t *testing.T) {
IncludedTags: types.StringValue("Name:production-server,Environment:production"),
ExcludedTags: types.StringValue("Name:staging-server,Environment:staging"),

EC2: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(true),
}},
ELB: []AWSIntegrationService{},
ALB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"alb.request.count", "alb.bytes.processed"},
RetireAutomatically: types.BoolValue(false),
}},
NLB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
RDS: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"rds.cpu.used"},
RetireAutomatically: types.BoolValue(false),
}},
Redshift: []AWSIntegrationService{},
ElastiCache: []AWSIntegrationServiceWithRetireAutomatically{},
SQS: []AWSIntegrationService{},
Lambda: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
DynamoDB: []AWSIntegrationService{},
CloudFront: []AWSIntegrationService{},
APIGateway: []AWSIntegrationService{},
Kinesis: []AWSIntegrationService{},
S3: []AWSIntegrationService{},
ES: []AWSIntegrationService{},
ECSCluster: []AWSIntegrationService{},
SES: []AWSIntegrationService{},
States: []AWSIntegrationService{},
EFS: []AWSIntegrationService{},
Firehose: []AWSIntegrationService{},
Batch: []AWSIntegrationService{},
WAF: []AWSIntegrationService{},
Billing: []AWSIntegrationService{},
Route53: []AWSIntegrationService{},
Connect: []AWSIntegrationService{},
DocDB: []AWSIntegrationService{},
CodeBuild: []AWSIntegrationService{},
AWSIntegrationSerfvices: AWSIntegrationSerfvices{
EC2: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(true),
}},
ELB: []AWSIntegrationService{},
ALB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"alb.request.count", "alb.bytes.processed"},
RetireAutomatically: types.BoolValue(false),
}},
NLB: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
RDS: []AWSIntegrationServiceWithRetireAutomatically{{
Enable: types.BoolValue(true),
Role: types.StringValue("service: role"),
ExcludedMetrics: []string{"rds.cpu.used"},
RetireAutomatically: types.BoolValue(false),
}},
Redshift: []AWSIntegrationService{},
ElastiCache: []AWSIntegrationServiceWithRetireAutomatically{},
SQS: []AWSIntegrationService{},
Lambda: []AWSIntegrationService{{
Enable: types.BoolValue(true),
Role: types.StringNull(),
ExcludedMetrics: []string{},
RetireAutomatically: types.BoolValue(false),
}},
DynamoDB: []AWSIntegrationService{},
CloudFront: []AWSIntegrationService{},
APIGateway: []AWSIntegrationService{},
Kinesis: []AWSIntegrationService{},
S3: []AWSIntegrationService{},
ES: []AWSIntegrationService{},
ECSCluster: []AWSIntegrationService{},
SES: []AWSIntegrationService{},
States: []AWSIntegrationService{},
EFS: []AWSIntegrationService{},
Firehose: []AWSIntegrationService{},
Batch: []AWSIntegrationService{},
WAF: []AWSIntegrationService{},
Billing: []AWSIntegrationService{},
Route53: []AWSIntegrationService{},
Connect: []AWSIntegrationService{},
DocDB: []AWSIntegrationService{},
CodeBuild: []AWSIntegrationService{},
},
},
param: mackerel.CreateAWSIntegrationParam{
Name: "aws-integration",
Expand Down
Loading
Loading