Skip to content

Commit 6562b9d

Browse files
authored
Fix maintenance workflow (#798)
* Install Terraform explicitly * Remove unneeded aws-sdk-go v1 dependency * Remove NamespaceName suppress the following error: panic: regexp: Compile(`^[!-~]{1,1024}$`): error parsing regexp: invalid repeat count: `{1,1024}`
1 parent ed4ff6e commit 6562b9d

7 files changed

+6
-264
lines changed

.github/workflows/maintenance.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
- uses: actions/setup-go@v5
1414
with:
1515
go-version-file: 'go.mod'
16-
- run: |
17-
go get github.com/aws/aws-sdk-go
18-
go mod tidy
16+
- uses: hashicorp/setup-terraform@v3
17+
- name: go generate ./...
18+
run: |
1919
cd tools/provider-schema
2020
terraform init -upgrade
2121
terraform providers schema -json > schema.json

docs/rules/README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,14 +1177,11 @@ These rules enforce best practices and naming conventions:
11771177
|aws_securityhub_standards_control_invalid_standards_control_arn||
11781178
|aws_securityhub_standards_subscription_invalid_standards_arn||
11791179
|aws_service_discovery_http_namespace_invalid_description||
1180-
|aws_service_discovery_http_namespace_invalid_name||
11811180
|aws_service_discovery_instance_invalid_instance_id||
11821181
|aws_service_discovery_instance_invalid_service_id||
11831182
|aws_service_discovery_private_dns_namespace_invalid_description||
1184-
|aws_service_discovery_private_dns_namespace_invalid_name||
11851183
|aws_service_discovery_private_dns_namespace_invalid_vpc||
11861184
|aws_service_discovery_public_dns_namespace_invalid_description||
1187-
|aws_service_discovery_public_dns_namespace_invalid_name||
11881185
|aws_service_discovery_service_invalid_description||
11891186
|aws_servicecatalog_budget_resource_association_invalid_budget_name||
11901187
|aws_servicecatalog_budget_resource_association_invalid_resource_id||

rules/models/aws_service_discovery_http_namespace_invalid_name.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

rules/models/aws_service_discovery_private_dns_namespace_invalid_name.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

rules/models/aws_service_discovery_public_dns_namespace_invalid_name.go

Lines changed: 0 additions & 84 deletions
This file was deleted.

rules/models/mappings/service-discovery.hcl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import = "aws-sdk-ruby/apis/servicediscovery/2017-03-14/api-2.json"
22

33
mapping "aws_service_discovery_http_namespace" {
4-
name = NamespaceName
4+
name = any //NamespaceName
55
description = ResourceDescription
66
}
77

@@ -12,13 +12,13 @@ mapping "aws_service_discovery_instance" {
1212
}
1313

1414
mapping "aws_service_discovery_private_dns_namespace" {
15-
name = NamespaceName
15+
name = any //NamespaceName
1616
vpc = ResourceId
1717
description = ResourceDescription
1818
}
1919

2020
mapping "aws_service_discovery_public_dns_namespace" {
21-
name = NamespaceName
21+
name = any //NamespaceName
2222
description = ResourceDescription
2323
}
2424

rules/models/provider.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,14 +1099,11 @@ var Rules = []tflint.Rule{
10991099
NewAwsSecurityhubStandardsControlInvalidStandardsControlArnRule(),
11001100
NewAwsSecurityhubStandardsSubscriptionInvalidStandardsArnRule(),
11011101
NewAwsServiceDiscoveryHTTPNamespaceInvalidDescriptionRule(),
1102-
NewAwsServiceDiscoveryHTTPNamespaceInvalidNameRule(),
11031102
NewAwsServiceDiscoveryInstanceInvalidInstanceIDRule(),
11041103
NewAwsServiceDiscoveryInstanceInvalidServiceIDRule(),
11051104
NewAwsServiceDiscoveryPrivateDNSNamespaceInvalidDescriptionRule(),
1106-
NewAwsServiceDiscoveryPrivateDNSNamespaceInvalidNameRule(),
11071105
NewAwsServiceDiscoveryPrivateDNSNamespaceInvalidVpcRule(),
11081106
NewAwsServiceDiscoveryPublicDNSNamespaceInvalidDescriptionRule(),
1109-
NewAwsServiceDiscoveryPublicDNSNamespaceInvalidNameRule(),
11101107
NewAwsServiceDiscoveryServiceInvalidDescriptionRule(),
11111108
NewAwsServicecatalogBudgetResourceAssociationInvalidBudgetNameRule(),
11121109
NewAwsServicecatalogBudgetResourceAssociationInvalidResourceIDRule(),

0 commit comments

Comments
 (0)