Refactor to Service Packages

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,4 @@
-<!--- See what makes a good Pull Request at : https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/CONTRIBUTING.md --->
+<!--- See what makes a good Pull Request at : https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing --->
 
 <!--- Please keep this note for the community --->
 

.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/changelog.yml

@@ -49,7 +49,7 @@ jobs:
           body: |-
             Thank you for your contribution! :rocket:
 
-            Please note that the `CHANGELOG.md` file contents are handled by the maintainers during merge. This is to prevent pull request merge conflicts, especially for contributions which may not be merged immediately. Please see the [Contributing Guide](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/CONTRIBUTING.md) for additional pull request review items.
+            Please note that the `CHANGELOG.md` file contents are handled by the maintainers during merge. This is to prevent pull request merge conflicts, especially for contributions which may not be merged immediately. Please see the [Contributing Guide](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing) for additional pull request review items.
 
             Remove any changes to the `CHANGELOG.md` file and commit them in this pull request to prevent delays with reviewing and potentially merging this pull request.
   misspell:

.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) guide and [FAQ](https://github.com/hashicorp/terraform-provider-aws/blob/main/docs/contributing/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/contributing/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
@@ -242,8 +242,8 @@ jobs:
         path: ~/go/pkg/mod
         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: golangci-lint run ./internal/...
+    - 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
@@ -12,10 +12,7 @@ build: fmtcheck
 	go install
 
 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/service/**/*_gen.go
 	go generate ./...
 
 sweep:
@@ -40,7 +37,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 +82,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 +116,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 +162,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

README.md

@@ -23,7 +23,7 @@ Please note: We take Terraform's security and our users' trust very seriously. I
 ## Quick Starts
 
 - [Using the provider](https://www.terraform.io/docs/providers/aws/index.html)
-- [Provider development](docs/DEVELOPMENT.md)
+- [Provider development](docs/contributing)
 
 ## Documentation
 
@@ -37,10 +37,10 @@ Our roadmap for expanding support in Terraform for AWS resources can be found in
 
 ## Frequently Asked Questions
 
-Responses to our most frequently asked questions can be found in our [FAQ](docs/FAQ.md )
+Responses to our most frequently asked questions can be found in our [FAQ](docs/contributing/faq.md )
 
 ## Contributing
 
 The Terraform AWS Provider is the work of thousands of contributors. We appreciate your help!
 
-To contribute, please read the contribution guidelines: [Contributing to Terraform - AWS Provider](docs/CONTRIBUTING.md)
+To contribute, please read the contribution guidelines: [Contributing to Terraform - AWS Provider](docs/contributing)

ROADMAP.md

@@ -2,7 +2,7 @@
 
 Every few months, the team will highlight areas of focus for our work and upcoming research.
 
-We select items for inclusion in the roadmap from the Top 10 Community Issues, [Core Services](docs/CORE_SERVICES.md), and internal priorities. Where community sourced contributions exist we will work with the authors to review and merge their work. Where this does not exist or the original contributors are not available we will create the resources and implementation ourselves.
+We select items for inclusion in the roadmap from the Top 10 Community Issues, [Core Services](docs/contributing/core-services.md), and internal priorities. Where community sourced contributions exist we will work with the authors to review and merge their work. Where this does not exist or the original contributors are not available we will create the resources and implementation ourselves.
 
 Each weekly release will include necessary tasks that lead to the completion of the stated goals as well as community pull requests, enhancements, and features that are not highlighted in the roadmap. To view all the items we've prioritized for this quarter, please see the [Roadmap milestone](https://github.com/hashicorp/terraform-provider-aws/milestone/138).