Service Packages: First merge candidate

.github/dependabot.yml

@@ -12,7 +12,7 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "gomod"
-    directory: "/awsproviderlint"
+    directory: "/providerlint"
     ignore:
       - dependency-name: "golang.org/x/tools"
       - dependency-name: "google.golang.org/grpc"

.github/workflows/dependencies.yml

@@ -20,7 +20,7 @@ jobs:
         with:
           filters: |
             changed:
-              - awsproviderlint/**
+              - providerlint/**
               - go.mod
               - go.sum
   comment:

.github/workflows/pull_requests.yml

@@ -50,8 +50,8 @@ jobs:
           pr-message: |-
             Welcome @${{github.actor}} :wave:
 
-            It looks like this is your first Pull Request submission to the [Terraform AWS Provider](https://github.com/terraform-providers/terraform-provider-aws)! If you haven’t already done so please make sure you have checked out our [CONTRIBUTING](https://github.com/terraform-providers/terraform-provider-aws/blob/main/docs/CONTRIBUTING.md) guide and [FAQ](https://github.com/terraform-providers/terraform-provider-aws/blob/main/docs/FAQ.md) to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.
+            It looks like this is your first Pull Request submission to the [Terraform AWS Provider](https://github.com/hashicorp/terraform-provider-aws)! If you haven’t already done so please make sure you have checked out our [CONTRIBUTING](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/CONTRIBUTING.md) guide and [FAQ](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/FAQ.md) to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.
 
-            Also take a look at our [FAQ](https://github.com/terraform-providers/terraform-provider-aws/blob/main/docs/FAQ.md) which details how we prioritize Pull Requests for inclusion.
+            Also take a look at our [FAQ](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/FAQ.md) which details how we prioritize Pull Requests for inclusion.
 
             Thanks again, and welcome to the community! :smiley:         

.github/workflows/terraform_provider.yml

@@ -12,7 +12,7 @@ on:
       - .golangci.yml
       - .semgrep.yml
       - aws/**
-      - awsproviderlint/**
+      - providerlint/**
       - docs/index.md
       - docs/data-sources/**
       - docs/guides/**
@@ -123,7 +123,7 @@ jobs:
         mkdir terraform-providers-schema
         terraform providers schema -json > terraform-providers-schema/schema.json
 
-  awsproviderlint:
+  providerlint:
     needs: [go_build]
     runs-on: ubuntu-latest
     steps:
@@ -149,9 +149,9 @@ jobs:
       with:
         path: ~/go/pkg/mod
         key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
-    - run: cd awsproviderlint && go install .
-    - name: awsproviderlint
-      run: make awsproviderlint
+    - run: cd providerlint && go install .
+    - name: providerlint
+      run: make providerlint
 
   go_generate:
     name: go generate
@@ -243,7 +243,7 @@ jobs:
         key: ${{ runner.os }}-go-pkg-mod-${{ hashFiles('go.sum') }}
     - run: cd tools && go install github.com/golangci/golangci-lint/cmd/golangci-lint
     - run: golangci-lint run ./aws/...
-    - run: cd awsproviderlint && golangci-lint run ./...
+    - run: cd providerlint && golangci-lint run ./...
 
   importlint:
     needs: [go_build]

.semgrep.yml

@@ -73,7 +73,7 @@ rules:
         - aws/waf_helpers.go
         - aws/internal/generators/
         - aws/internal/keyvaluetags/
-        - awsproviderlint/vendor/
+        - providerlint/vendor/
       include:
         - aws/
     patterns:
@@ -108,7 +108,7 @@ rules:
         - aws/internal/generators/
         - aws/internal/keyvaluetags/
         - aws/internal/naming/
-        - awsproviderlint/vendor/
+        - providerlint/vendor/
       include:
         - aws/
     patterns:
@@ -572,7 +572,7 @@ rules:
     message: Do not call `fmt.Print` and variant
     paths:
       exclude:
-        - awsproviderlint/vendor/
+        - providerlint/vendor/
       include:
         - aws/
     patterns:
@@ -621,7 +621,7 @@ rules:
       include:
         - aws/
       exclude:
-        - awsproviderlint/vendor/
+        - providerlint/vendor/
     patterns:
       # This isn't technically the correct regex, but for some reason adding a '+' causes the regex to
       # miss some SSH keys. AFAICT, this is good enough.

GNUmakefile

@@ -1,7 +1,7 @@
 SWEEP?=us-east-1,us-east-2,us-west-2
 TEST?=./...
-SWEEP_DIR?=./aws
-PKG_NAME=aws
+SWEEP_DIR?=./internal
+PKG_NAME=internal
 TEST_COUNT?=1
 ACCTEST_TIMEOUT?=180m
 ACCTEST_PARALLELISM?=20
@@ -13,9 +13,9 @@ build: fmtcheck
 
 gen:
 	rm -f aws/*_gen.go aws/*_gen_test.go
-	rm -f aws/internal/keyvaluetags/*_gen.go
-	rm -f aws/internal/namevaluesfilters/*_gen.go
-	rm -f aws/internal/service/**/lister/*_gen.go
+	rm -f internal/keyvaluetags/*_gen.go
+	rm -f internal/namevaluesfilters/*_gen.go
+	rm -f internal/service/**/lister/*_gen.go
 	go generate ./...
 
 sweep:
@@ -40,7 +40,7 @@ testacc: fmtcheck
 
 fmt:
 	@echo "==> Fixing source code with gofmt..."
-	gofmt -s -w ./$(PKG_NAME) $(filter-out ./awsproviderlint/go% ./awsproviderlint/README.md ./awsproviderlint/vendor, $(wildcard ./awsproviderlint/*))
+	gofmt -s -w ./$(PKG_NAME) $(filter-out ./providerlint/go% ./providerlint/README.md ./providerlint/vendor, $(wildcard ./providerlint/*))
 
 # Currently required by tf-deploy compile
 fmtcheck:
@@ -85,13 +85,13 @@ docscheck:
 		-require-resource-subcategory
 	@misspell -error -source text CHANGELOG.md .changelog
 
-lint: golangci-lint awsproviderlint importlint
+lint: golangci-lint providerlint importlint
 
 golangci-lint:
 	@golangci-lint run ./$(PKG_NAME)/...
 
-awsproviderlint:
-	@awsproviderlint \
+providerlint:
+	@providerlint \
 		-c 1 \
 		-AWSAT006=false \
 		-AWSR002=false \
@@ -119,7 +119,7 @@ importlint:
 	@impi --local . --scheme stdThirdPartyLocal ./$(PKG_NAME)/...
 
 tools:
-	cd awsproviderlint && go install .
+	cd providerlint && go install .
 	cd tools && go install github.com/bflad/tfproviderdocs
 	cd tools && go install github.com/client9/misspell/cmd/misspell
 	cd tools && go install github.com/golangci/golangci-lint/cmd/golangci-lint
@@ -165,4 +165,4 @@ semgrep:
 	@echo "==> Running Semgrep static analysis..."
 	@docker run --rm --volume "${PWD}:/src" returntocorp/semgrep --config .semgrep.yml
 
-.PHONY: awsproviderlint build gen generate-changelog golangci-lint sweep test testacc fmt fmtcheck lint tools test-compile website-link-check website-lint website-lint-fix depscheck docscheck semgrep
+.PHONY: providerlint build gen generate-changelog golangci-lint sweep test testacc fmt fmtcheck lint tools test-compile website-link-check website-lint website-lint-fix depscheck docscheck semgrep