…t-and-pp

fix trivial conflicts where master has changed how resources are listed (in website and in aws/provider),
to reference servicecatalog_product in the right way

also revert the mode change against the servicecatalog_portfolio markdown

only pulling in the relevant provisioned-product changes

* create needs to block for completion, then the test (as written) will work in our account
* then we need product_portfolio_association and make the test work in any account (create a product, not hard-coded)
* then other TODOs marked in code

* master: (79 commits)
  Update CHANGELOG for hashicorp#8457
  resource/aws_ec2_tag: Finish implementation
  CodeArtifact new service support (hashicorp#13735)
  internal/keyvaluetags: Support servicediscovery and worklink (hashicorp#13732)
  tests/provider: Remove TravisCI (hashicorp#13730)
  update method params in web_acl test check
  Update CHANGELOG for hashicorp#12688
  Fix rebase change
  Fix docs
  Improve error message
  Apply review comments
  Refactor after rebase
  Apply review comments
  Apply changes based on review
  Format test config
  Fix failing build
  Add calculated wcus attribute
  Add documentation
  Add rule_group_reference_statement
  Add rate_based_statement
  ...

Match the same method used in other places within the provider to create idempotency tokens.

…ovider-aws into sc-product-and-pp

TODO - pagination for readResource
TODO - acceptance tests
TODO - rename methods for consistency

…t association

minor tweaks to the SC product doc also

…ovider-aws into sc-product-and-pp

…ovider-aws into sc-product-and-pp

…ovider-aws into sc-product-and-pp

… importing

but PP test is still using a pre-existing product :( because it needs a launch path

…ovider-aws into sc-product-and-pp

…ing test

working to provision the product. but deletions don't work as it is trying to delete the product before the association to portfolio is deleted.

…ovider-aws into sc-product-and-pp

Avoids fetching all pages then searching the results for the matching record.

…nd consistent salt

…ovider-aws into sc-product-and-pp

just needed s3 permissions. and the stock import test doesn't like the different provider.

"Description" omitted, and one use of "provider" is needed (for aliases)

…flicts)

…cremental PRs

…emental PRs

…emental PRs

…ncremental PR with just this code, for review

This reverts commit 625c9b7.

* disappears, import, various updates
* portfolio updated to retry on delete if it is in use while other things are being cleaned up
* read has retry logic to deal with ID being returned instead of ARN for just-created roles

…vailing conventions

…rafmt requirements

…iation

…iation

Conflicts:
	website/aws.erb - no longer needed (drop our changes)