diff --git a/.gitignore b/.gitignore index b559977b6..1109e1a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ modules-dev/ pkg/ vendor/ website/.vagrant +website/.bundle website/build website/node_modules .vagrant/ diff --git a/scripts/website_push.sh b/scripts/website_push.sh deleted file mode 100755 index 53ed59777..000000000 --- a/scripts/website_push.sh +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -# Switch to the stable-website branch -git checkout stable-website - -# Set the tmpdir -if [ -z "$TMPDIR" ]; then - TMPDIR="/tmp" -fi - -# Create a temporary build dir and make sure we clean it up. For -# debugging, comment out the trap line. -DEPLOY=`mktemp -d $TMPDIR/terraform-www-XXXXXX` -trap "rm -rf $DEPLOY" INT TERM EXIT - -# Get the parent directory of where this script is. -SOURCE="${BASH_SOURCE[0]}" -while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done -DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" - -# Copy into tmpdir -shopt -s dotglob -cp -r $DIR/website/* $DEPLOY/ - -# Change into that directory -pushd $DEPLOY &>/dev/null - -# Ignore some stuff -touch .gitignore -echo ".sass-cache" >> .gitignore -echo "build" >> .gitignore -echo "vendor" >> .gitignore - -# Add everything -git init -q . -git add . -git commit -q -m "Deploy by $USER" - -git remote add heroku git@heroku.com:terraform-www.git -git push -f heroku master - -# Go back to our root -popd &>/dev/null diff --git a/website/.buildpacks b/website/.buildpacks deleted file mode 100644 index f85b304c3..000000000 --- a/website/.buildpacks +++ /dev/null @@ -1,2 +0,0 @@ -https://github.com/heroku/heroku-buildpack-ruby.git -https://github.com/hashicorp/heroku-buildpack-middleman.git diff --git a/website/.bundle/config b/website/.bundle/config new file mode 100644 index 000000000..df11c7518 --- /dev/null +++ b/website/.bundle/config @@ -0,0 +1,2 @@ +--- +BUNDLE_DISABLE_SHARED_GEMS: '1' diff --git a/website/Gemfile.lock b/website/Gemfile.lock index 725b16df3..6beb2d721 100644 --- a/website/Gemfile.lock +++ b/website/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/hashicorp/middleman-hashicorp - revision: 15cbda0cf1d963fa71292dee921229e7ee618272 + revision: 953baf8762b915cf57553bcc82bc946ad777056f specs: middleman-hashicorp (0.2.0) bootstrap-sass (~> 3.3) @@ -21,18 +21,18 @@ GIT GEM remote: https://rubygems.org/ specs: - activesupport (4.2.4) + activesupport (4.2.5) i18n (~> 0.7) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - autoprefixer-rails (6.0.3) + autoprefixer-rails (6.3.0) execjs json - bootstrap-sass (3.3.5.1) - autoprefixer-rails (>= 5.0.0.1) - sass (>= 3.3.0) + bootstrap-sass (3.3.6) + autoprefixer-rails (>= 5.2.1) + sass (>= 3.3.4) builder (3.2.2) capybara (2.4.4) mime-types (>= 1.16) @@ -40,11 +40,11 @@ GEM rack (>= 1.0.0) rack-test (>= 0.5.4) xpath (~> 2.0) - chunky_png (1.3.4) + chunky_png (1.3.5) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) + coffee-script-source (1.10.0) commonjs (0.2.7) compass (1.0.3) chunky_png (~> 1.2) @@ -63,7 +63,7 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) erubis (2.7.0) - eventmachine (1.0.8) + eventmachine (1.0.9.1) execjs (2.6.0) ffi (1.9.10) git-version-bump (0.15.1) @@ -80,21 +80,21 @@ GEM less (2.6.0) commonjs (~> 0.2.7) libv8 (3.16.14.13) - listen (3.0.3) + listen (3.0.5) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) - middleman (3.4.0) + middleman (3.4.1) coffee-script (~> 2.2) compass (>= 1.0.0, < 2.0.0) compass-import-once (= 1.0.5) execjs (~> 2.0) haml (>= 4.0.5) kramdown (~> 1.2) - middleman-core (= 3.4.0) + middleman-core (= 3.4.1) middleman-sprockets (>= 3.1.2) sass (>= 3.4.0, < 4.0) uglifier (~> 2.5) - middleman-core (3.4.0) + middleman-core (3.4.1) activesupport (~> 4.1) bundler (~> 1.1) capybara (~> 2.4.4) @@ -106,7 +106,7 @@ GEM rack (>= 1.4.5, < 2.0) thor (>= 0.15.2, < 2.0) tilt (~> 1.4.1, < 2.0) - middleman-livereload (3.4.3) + middleman-livereload (3.4.6) em-websocket (~> 0.5.1) middleman-core (>= 3.3) rack-livereload (~> 0.3.15) @@ -118,15 +118,17 @@ GEM sprockets (~> 2.12.1) sprockets-helpers (~> 1.1.0) sprockets-sass (~> 1.3.0) - middleman-syntax (2.0.0) - middleman-core (~> 3.2) + middleman-syntax (2.1.0) + middleman-core (>= 3.2) rouge (~> 1.0) - mime-types (2.6.2) - mini_portile (0.6.2) - minitest (5.8.1) + mime-types (3.0) + mime-types-data (~> 3.2015) + mime-types-data (3.2015.1120) + mini_portile2 (2.0.0) + minitest (5.8.3) multi_json (1.11.2) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + nokogiri (1.6.7.1) + mini_portile2 (~> 2.0.0.rc2) padrino-helpers (0.12.5) i18n (~> 0.6, >= 0.6.7) padrino-support (= 0.12.5) @@ -145,13 +147,13 @@ GEM rack-ssl-enforcer (0.2.9) rack-test (0.6.3) rack (>= 1.0) - rb-fsevent (0.9.6) + rb-fsevent (0.9.7) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.3.3) + redcarpet (3.3.4) ref (2.0.0) rouge (1.10.1) - sass (3.4.19) + sass (3.4.21) sprockets (2.12.4) hike (~> 1.2) multi_json (~> 1.0) @@ -186,3 +188,6 @@ PLATFORMS DEPENDENCIES middleman-hashicorp! + +BUNDLED WITH + 1.10.6 diff --git a/website/Procfile b/website/Procfile deleted file mode 100644 index 58361e473..000000000 --- a/website/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: bundle exec thin start -p $PORT diff --git a/website/packer.json b/website/packer.json new file mode 100644 index 000000000..b230c7e51 --- /dev/null +++ b/website/packer.json @@ -0,0 +1,41 @@ +{ + "variables": { + "aws_access_key_id": "{{ env `AWS_ACCESS_KEY_ID` }}", + "aws_secret_access_key": "{{ env `AWS_SECRET_ACCESS_KEY` }}", + "aws_region": "{{ env `AWS_REGION` }}", + "fastly_api_key": "{{ env `FASTLY_API_KEY` }}" + }, + "builders": [ + { + "type": "docker", + "image": "ruby:2.3-slim", + "commit": "true" + } + ], + "provisioners": [ + { + "type": "file", + "source": ".", + "destination": "/app" + }, + { + "type": "shell", + "environment_vars": [ + "AWS_ACCESS_KEY_ID={{ user `aws_access_key_id` }}", + "AWS_SECRET_ACCESS_KEY={{ user `aws_secret_access_key` }}", + "AWS_REGION={{ user `aws_region` }}", + "FASTLY_API_KEY={{ user `fastly_api_key` }}" + ], + "inline": [ + "apt-get update", + "apt-get install -y build-essential curl git libffi-dev s3cmd wget", + "cd /app", + + "bundle check || bundle install --jobs 7", + "bundle exec middleman build", + + "/bin/bash ./scripts/deploy.sh" + ] + } + ] +} diff --git a/website/scripts/deploy.sh b/website/scripts/deploy.sh new file mode 100755 index 000000000..9376c39cd --- /dev/null +++ b/website/scripts/deploy.sh @@ -0,0 +1,88 @@ +#!/bin/bash +set -e + +PROJECT="terraform" +PROJECT_URL="www.terraform.io" +FASTLY_SERVICE_ID="7GrxRJP3PVBuqQbyxYQ0MV" + +# Ensure the proper AWS environment variables are set +if [ -z "$AWS_ACCESS_KEY_ID" ]; then + echo "Missing AWS_ACCESS_KEY_ID!" + exit 1 +fi + +if [ -z "$AWS_SECRET_ACCESS_KEY" ]; then + echo "Missing AWS_SECRET_ACCESS_KEY!" + exit 1 +fi + +# Ensure the proper Fastly keys are set +if [ -z "$FASTLY_API_KEY" ]; then + echo "Missing FASTLY_API_KEY!" + exit 1 +fi + +# Ensure we have s3cmd installed +if ! command -v "s3cmd" >/dev/null 2>&1; then + echo "Missing s3cmd!" + exit 1 +fi + +# Get the parent directory of where this script is and change into our website +# directory +SOURCE="${BASH_SOURCE[0]}" +while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done +DIR="$(cd -P "$( dirname "$SOURCE" )/.." && pwd)" + +# Delete any .DS_Store files for our OS X friends. +find "$DIR" -type f -name '.DS_Store' -delete + +# Upload the files to S3 - we disable mime-type detection by the python library +# and just guess from the file extension because it's surprisingly more +# accurate, especially for CSS and javascript. We also tag the uploaded files +# with the proper Surrogate-Key, which we will later purge in our API call to +# Fastly. +if [ -z "$NO_UPLOAD" ]; then + echo "Uploading to S3..." + + # Check that the site has been built + if [ ! -d "$DIR/build" ]; then + echo "Missing compiled website! Run 'make build' to compile!" + exit 1 + fi + + s3cmd \ + --quiet \ + --delete-removed \ + --guess-mime-type \ + --no-mime-magic \ + --acl-public \ + --recursive \ + --add-header="Cache-Control: max-age=31536000" \ + --add-header="x-amz-meta-surrogate-key: site-$PROJECT" \ + sync "$DIR/build/" "s3://hc-sites/$PROJECT/latest/" +fi + +# Perform a soft-purge of the surrogate key. +if [ -z "$NO_PURGE" ]; then + echo "Purging Fastly cache..." + curl \ + --fail \ + --silent \ + --output /dev/null \ + --request "POST" \ + --header "Accept: application/json" \ + --header "Fastly-Key: $FASTLY_API_KEY" \ + --header "Fastly-Soft-Purge: 1" \ + "https://api.fastly.com/service/$FASTLY_SERVICE_ID/purge/site-$PROJECT" +fi + +# Warm the cache with recursive wget. +if [ -z "$NO_WARM" ]; then + echo "Warming Fastly cache..." + wget \ + --recursive \ + --delete-after \ + --quiet \ + "https://$PROJECT_URL/" +fi diff --git a/website/source/assets/images/bg-galaxy.jpg b/website/source/assets/images/bg-galaxy.jpg index 894a5b6ea..587004afa 100644 Binary files a/website/source/assets/images/bg-galaxy.jpg and b/website/source/assets/images/bg-galaxy.jpg differ diff --git a/website/source/assets/images/docs/atlas-workflow.png b/website/source/assets/images/docs/atlas-workflow.png index e519ee004..144e2cedc 100644 Binary files a/website/source/assets/images/docs/atlas-workflow.png and b/website/source/assets/images/docs/atlas-workflow.png differ diff --git a/website/source/assets/images/docs/module_graph.png b/website/source/assets/images/docs/module_graph.png index 196746116..482f4bb55 100644 Binary files a/website/source/assets/images/docs/module_graph.png and b/website/source/assets/images/docs/module_graph.png differ diff --git a/website/source/assets/images/docs/module_graph_expand.png b/website/source/assets/images/docs/module_graph_expand.png index d9a863193..32459c873 100644 Binary files a/website/source/assets/images/docs/module_graph_expand.png and b/website/source/assets/images/docs/module_graph_expand.png differ diff --git a/website/source/assets/images/favicon.png b/website/source/assets/images/favicon.png index 01eb4f927..14d04676c 100644 Binary files a/website/source/assets/images/favicon.png and b/website/source/assets/images/favicon.png differ diff --git a/website/source/assets/images/feature-iterate-bg.png b/website/source/assets/images/feature-iterate-bg.png index 1eb228009..d208badbf 100644 Binary files a/website/source/assets/images/feature-iterate-bg.png and b/website/source/assets/images/feature-iterate-bg.png differ diff --git a/website/source/assets/images/feature-iterate-bg@2x.png b/website/source/assets/images/feature-iterate-bg@2x.png index 950e3e8c2..77666d945 100644 Binary files a/website/source/assets/images/feature-iterate-bg@2x.png and b/website/source/assets/images/feature-iterate-bg@2x.png differ diff --git a/website/source/assets/images/footer-hashicorp-logo.png b/website/source/assets/images/footer-hashicorp-logo.png index 706fd1b4f..96ac85814 100644 Binary files a/website/source/assets/images/footer-hashicorp-logo.png and b/website/source/assets/images/footer-hashicorp-logo.png differ diff --git a/website/source/assets/images/footer-hashicorp-logo@2x.png b/website/source/assets/images/footer-hashicorp-logo@2x.png index 4aeacf2f4..34699040a 100644 Binary files a/website/source/assets/images/footer-hashicorp-logo@2x.png and b/website/source/assets/images/footer-hashicorp-logo@2x.png differ diff --git a/website/source/assets/images/footer-hashicorp-white-logo.png b/website/source/assets/images/footer-hashicorp-white-logo.png index 52122b23e..9fddc9779 100644 Binary files a/website/source/assets/images/footer-hashicorp-white-logo.png and b/website/source/assets/images/footer-hashicorp-white-logo.png differ diff --git a/website/source/assets/images/footer-hashicorp-white-logo@2x.png b/website/source/assets/images/footer-hashicorp-white-logo@2x.png index bd014b159..a0b479799 100644 Binary files a/website/source/assets/images/footer-hashicorp-white-logo@2x.png and b/website/source/assets/images/footer-hashicorp-white-logo@2x.png differ diff --git a/website/source/assets/images/graph-example.png b/website/source/assets/images/graph-example.png index 99ab088c5..0dbd6060a 100644 Binary files a/website/source/assets/images/graph-example.png and b/website/source/assets/images/graph-example.png differ diff --git a/website/source/assets/images/header-download-icon.png b/website/source/assets/images/header-download-icon.png index 56becb7ab..bface9334 100644 Binary files a/website/source/assets/images/header-download-icon.png and b/website/source/assets/images/header-download-icon.png differ diff --git a/website/source/assets/images/header-github-icon.png b/website/source/assets/images/header-github-icon.png index 1d4c90159..5bef9cb89 100644 Binary files a/website/source/assets/images/header-github-icon.png and b/website/source/assets/images/header-github-icon.png differ diff --git a/website/source/assets/images/header-github-icon@2x.png b/website/source/assets/images/header-github-icon@2x.png index 72a9e6fc2..ab15e12df 100644 Binary files a/website/source/assets/images/header-github-icon@2x.png and b/website/source/assets/images/header-github-icon@2x.png differ diff --git a/website/source/assets/images/hero-bg.png b/website/source/assets/images/hero-bg.png index 09f4ae91f..61cac8172 100644 Binary files a/website/source/assets/images/hero-bg.png and b/website/source/assets/images/hero-bg.png differ diff --git a/website/source/assets/images/logo-header-black@2x.png b/website/source/assets/images/logo-header-black@2x.png index 74521a664..312f8692e 100644 Binary files a/website/source/assets/images/logo-header-black@2x.png and b/website/source/assets/images/logo-header-black@2x.png differ diff --git a/website/source/assets/images/logo-header.png b/website/source/assets/images/logo-header.png index 8e1956a74..7054f3dbb 100644 Binary files a/website/source/assets/images/logo-header.png and b/website/source/assets/images/logo-header.png differ diff --git a/website/source/assets/images/logo-header@2x.png b/website/source/assets/images/logo-header@2x.png index a96feef3a..417086a93 100644 Binary files a/website/source/assets/images/logo-header@2x.png and b/website/source/assets/images/logo-header@2x.png differ diff --git a/website/source/assets/images/logo-static.png b/website/source/assets/images/logo-static.png index f98abbf10..7cfecc36a 100644 Binary files a/website/source/assets/images/logo-static.png and b/website/source/assets/images/logo-static.png differ diff --git a/website/source/assets/images/readme.png b/website/source/assets/images/readme.png index 620f40742..bec5aa7f5 100644 Binary files a/website/source/assets/images/readme.png and b/website/source/assets/images/readme.png differ diff --git a/website/source/assets/images/sidebar-wire.png b/website/source/assets/images/sidebar-wire.png index c21918988..87ccdf351 100644 Binary files a/website/source/assets/images/sidebar-wire.png and b/website/source/assets/images/sidebar-wire.png differ diff --git a/website/source/community.html.erb b/website/source/community.html.erb index 9f7a60821..3bf5550ce 100644 --- a/website/source/community.html.erb +++ b/website/source/community.html.erb @@ -33,7 +33,7 @@ disappear from this list as contributors come and go.

- +

Mitchell Hashimoto (@mitchellh)

@@ -48,7 +48,7 @@ disappear from this list as contributors come and go.

- +

Armon Dadgar (@armon)

@@ -64,7 +64,7 @@ disappear from this list as contributors come and go.

- +

Jack Pearkes (@pearkes)

diff --git a/website/source/docs/commands/push.html.markdown b/website/source/docs/commands/push.html.markdown index 11130a8cb..f6dda9e64 100644 --- a/website/source/docs/commands/push.html.markdown +++ b/website/source/docs/commands/push.html.markdown @@ -96,8 +96,8 @@ don't already exist on Atlas. If you want to force push a certain variable value to update it, use the `-overwrite` flag. All the variable values stored on Atlas are encrypted and secured -using [Vault](https://vaultproject.io). We blogged about the -[architecture of our secure storage system](https://hashicorp.com/blog/how-atlas-uses-vault-for-managing-secrets.html) if you want more detail. +using [Vault](https://www.vaultproject.io). We blogged about the +[architecture of our secure storage system](https://www.hashicorp.com/blog/how-atlas-uses-vault-for-managing-secrets.html) if you want more detail. The variable values can be updated using the `-overwrite` flag or via the [Atlas website](https://atlas.hashicorp.com). An example of updating diff --git a/website/source/docs/commands/remote-config.html.markdown b/website/source/docs/commands/remote-config.html.markdown index ee0da4549..22cdc9333 100644 --- a/website/source/docs/commands/remote-config.html.markdown +++ b/website/source/docs/commands/remote-config.html.markdown @@ -77,9 +77,9 @@ The following backends are supported: Other supported parameters include: * `bucket` - the name of the S3 bucket * `key` - path where to place/look for state file inside the bucket - * `encrypt` - whether to enable [server side encryption](http://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html) + * `encrypt` - whether to enable [server side encryption](https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingServerSideEncryption.html) of the state file - * `acl` - [Canned ACL](http://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) + * `acl` - [Canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to be applied to the state file. * Artifactory - Stores the state as an artifact in a given repository in diff --git a/website/source/docs/configuration/interpolation.html.md b/website/source/docs/configuration/interpolation.html.md index 4e95e4851..018aed599 100644 --- a/website/source/docs/configuration/interpolation.html.md +++ b/website/source/docs/configuration/interpolation.html.md @@ -124,7 +124,7 @@ The supported built-in functions are: * `format(format, args...)` - Formats a string according to the given format. The syntax for the format is standard `sprintf` syntax. - Good documentation for the syntax can be [found here](http://golang.org/pkg/fmt/). + Good documentation for the syntax can be [found here](https://golang.org/pkg/fmt/). Example to zero-prefix a count, used commonly for naming servers: `format("web-%03d", count.index + 1)`. diff --git a/website/source/docs/configuration/load.html.md b/website/source/docs/configuration/load.html.md index 3ccbcf7b6..101ac3fec 100644 --- a/website/source/docs/configuration/load.html.md +++ b/website/source/docs/configuration/load.html.md @@ -31,6 +31,6 @@ which do merge. The order of variables, resources, etc. defined within the configuration doesn't matter. Terraform configurations are -[declarative](http://en.wikipedia.org/wiki/Declarative_programming), +[declarative](https://en.wikipedia.org/wiki/Declarative_programming), so references to other resources and variables do not depend on the order they're defined. diff --git a/website/source/docs/internals/graph.html.md b/website/source/docs/internals/graph.html.md index 6b74283ba..684156433 100644 --- a/website/source/docs/internals/graph.html.md +++ b/website/source/docs/internals/graph.html.md @@ -9,7 +9,7 @@ description: |- # Resource Graph Terraform builds a -[dependency graph](http://en.wikipedia.org/wiki/Dependency_graph) +[dependency graph](https://en.wikipedia.org/wiki/Dependency_graph) from the Terraform configurations, and walks this graph to generate plans, refresh state, and more. This page documents the details of what are contained in this graph, what types diff --git a/website/source/docs/plugins/provider.html.md b/website/source/docs/plugins/provider.html.md index 1ca41655b..57b7ccfaa 100644 --- a/website/source/docs/plugins/provider.html.md +++ b/website/source/docs/plugins/provider.html.md @@ -58,14 +58,14 @@ the framework beforehand, but it goes to show how expressive the framework can be. The GoDoc for `helper/schema` can be -[found here](http://godoc.org/github.com/hashicorp/terraform/helper/schema). +[found here](https://godoc.org/github.com/hashicorp/terraform/helper/schema). This is API-level documentation but will be extremely important for you going forward. ## Provider The first thing to do in your plugin is to create the -[schema.Provider](http://godoc.org/github.com/hashicorp/terraform/helper/schema#Provider) structure. +[schema.Provider](https://godoc.org/github.com/hashicorp/terraform/helper/schema#Provider) structure. This structure implements the `ResourceProvider` interface. We recommend creating this structure in a function to make testing easier later. Example: @@ -86,13 +86,13 @@ are documented within the godoc, but a brief overview is here as well: * `ResourcesMap` - The map of resources that this provider supports. All keys are resource names and the values are the - [schema.Resource](http://godoc.org/github.com/hashicorp/terraform/helper/schema#Resource) structures implementing this resource. + [schema.Resource](https://godoc.org/github.com/hashicorp/terraform/helper/schema#Resource) structures implementing this resource. * `ConfigureFunc` - This function callback is used to configure the provider. This function should do things such as initialize any API clients, validate API keys, etc. The `interface{}` return value of this function is the `meta` parameter that will be passed into all - resource [CRUD](http://en.wikipedia.org/wiki/Create,_read,_update_and_delete) + resource [CRUD](https://en.wikipedia.org/wiki/Create,_read,_update_and_delete) functions. In general, the returned value is a configuration structure or a client. @@ -127,7 +127,7 @@ func resourceComputeAddress() *schema.Resource { ``` Resources are described using the -[schema.Resource](http://godoc.org/github.com/hashicorp/terraform/helper/schema#Resource) +[schema.Resource](https://godoc.org/github.com/hashicorp/terraform/helper/schema#Resource) structure. This structure has the following fields: * `Schema` - The configuration schema for this resource. Schemas are @@ -189,7 +189,7 @@ best practices. A good starting place is the The parameter to provider configuration as well as all the CRUD operations on a resource is a -[schema.ResourceData](http://godoc.org/github.com/hashicorp/terraform/helper/schema#ResourceData). +[schema.ResourceData](https://godoc.org/github.com/hashicorp/terraform/helper/schema#ResourceData). This structure is used to query configurations as well as to set information about the resource such as its ID, connection information, and computed attributes. diff --git a/website/source/docs/providers/aws/r/autoscaling_lifecycle_hooks.html.markdown b/website/source/docs/providers/aws/r/autoscaling_lifecycle_hooks.html.markdown index a753c864b..115fce6a4 100644 --- a/website/source/docs/providers/aws/r/autoscaling_lifecycle_hooks.html.markdown +++ b/website/source/docs/providers/aws/r/autoscaling_lifecycle_hooks.html.markdown @@ -49,7 +49,7 @@ The following arguments are supported: * `autoscaling_group_name` - (Requred) The name of the Auto Scaling group to which you want to assign the lifecycle hook * `default_result` - (Optional) Defines the action the Auto Scaling group should take when the lifecycle hook timeout elapses or if an unexpected failure occurs. * `heartbeat_timeout` - (Optional) Defines the amount of time, in seconds, that can elapse before the lifecycle hook times out. When the lifecycle hook times out, Auto Scaling performs the action defined in the DefaultResult parameter -* `lifecycle_transition` - (Optional) The instance state to which you want to attach the lifecycle hook. For a list of lifecycle hook types, see [describe-lifecycle-hook-types](http://docs.aws.amazon.com/cli/latest/reference/autoscaling/describe-lifecycle-hook-types.html#examples) +* `lifecycle_transition` - (Optional) The instance state to which you want to attach the lifecycle hook. For a list of lifecycle hook types, see [describe-lifecycle-hook-types](https://docs.aws.amazon.com/cli/latest/reference/autoscaling/describe-lifecycle-hook-types.html#examples) * `notification_metadata` - (Optional) Contains additional information that you want to include any time Auto Scaling sends a message to the notification target. * `notification_target_arn` - (Required) The ARN of the notification target that Auto Scaling will use to notify you when an instance is in the transition state for the lifecycle hook. This ARN target can be either an SQS queue or an SNS topic. * `role_arn` - (Required) The ARN of the IAM role that allows the Auto Scaling group to publish to the specified notification target. \ No newline at end of file diff --git a/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown index e47d337c6..4ebb6fc6c 100644 --- a/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown +++ b/website/source/docs/providers/aws/r/autoscaling_notification.html.markdown @@ -64,5 +64,5 @@ The following attributes are exported: * `topic_arn` -[1]: http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_NotificationConfiguration.html -[2]: http://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_DescribeNotificationConfigurations.html +[1]: https://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_NotificationConfiguration.html +[2]: https://docs.aws.amazon.com/AutoScaling/latest/APIReference/API_DescribeNotificationConfigurations.html diff --git a/website/source/docs/providers/aws/r/autoscaling_policy.html.markdown b/website/source/docs/providers/aws/r/autoscaling_policy.html.markdown index 2543c0220..82671e698 100644 --- a/website/source/docs/providers/aws/r/autoscaling_policy.html.markdown +++ b/website/source/docs/providers/aws/r/autoscaling_policy.html.markdown @@ -12,8 +12,8 @@ Provides an AutoScaling Scaling Policy resource. ~> **NOTE:** You may want to omit `desired_capacity` attribute from attached `aws_autoscaling_group` when using autoscaling policies. It's good practice to pick either -[manual](http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-manual-scaling.html) -or [dynamic](http://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-scale-based-on-demand.html) +[manual](https://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-manual-scaling.html) +or [dynamic](https://docs.aws.amazon.com/AutoScaling/latest/DeveloperGuide/as-scale-based-on-demand.html) (policy-based) scaling. ## Example Usage diff --git a/website/source/docs/providers/aws/r/cloudwatch_metric_alarm.html.markdown b/website/source/docs/providers/aws/r/cloudwatch_metric_alarm.html.markdown index 215db6b62..ab627eab4 100644 --- a/website/source/docs/providers/aws/r/cloudwatch_metric_alarm.html.markdown +++ b/website/source/docs/providers/aws/r/cloudwatch_metric_alarm.html.markdown @@ -54,7 +54,7 @@ resource "aws_cloudwatch_metric_alarm" "bat" { ``` ## Argument Reference -See [related part of AWS Docs](http://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_PutMetricAlarm.html) +See [related part of AWS Docs](https://docs.aws.amazon.com/AmazonCloudWatch/latest/APIReference/API_PutMetricAlarm.html) for details about valid values. The following arguments are supported: @@ -63,8 +63,10 @@ The following arguments are supported: * `comparison_operator` - (Required) The arithmetic operation to use when comparing the specified Statistic and Threshold. The specified Statistic value is used as the first operand. Either of the following is supported: `GreaterThanOrEqualToThreshold`, `GreaterThanThreshold`, `LessThanThreshold`, `LessThanOrEqualToThreshold`. * `evaluation_periods` - (Required) The number of periods over which data is compared to the specified threshold. * `metric_name` - (Required) The name for the alarm's associated metric. - See docs for [supported metrics](http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html). -* `namespace` - (Required) The namespace for the alarm's associated metric. See docs for the [list of namespaces](http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/aws-namespaces.html). + See docs for [supported metrics](https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html). +* `namespace` - (Required) The namespace for the alarm's associated metric. See docs for the [list of namespaces](https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/aws-namespaces.html). + See docs for [supported metrics](https://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/CW_Support_For_AWS.html). +* `namespace` - (Required) The namespace for the alarm's associated metric. * `period` - (Required) The period in seconds over which the specified `statistic` is applied. * `statistic` - (Required) The statistic to apply to the alarm's associated metric. Either of the following is supported: `SampleCount`, `Average`, `Sum`, `Minimum`, `Maximum` diff --git a/website/source/docs/providers/aws/r/db_instance.html.markdown b/website/source/docs/providers/aws/r/db_instance.html.markdown index f3e4eb708..0b8178477 100644 --- a/website/source/docs/providers/aws/r/db_instance.html.markdown +++ b/website/source/docs/providers/aws/r/db_instance.html.markdown @@ -8,19 +8,19 @@ description: |- # aws\_db\_instance -Provides an RDS instance resource. A DB instance is an isolated database -environment in the cloud. A DB instance can contain multiple user-created -databases. +Provides an RDS instance resource. A DB instance is an isolated database +environment in the cloud. A DB instance can contain multiple user-created +databases. Changes to a DB instance can occur when you manually change a parameter, such as `allocated_storage`, and are reflected in the next maintenance window. Because of this, Terraform may report a difference in it's planning phase because a modification has not yet taken place. You can use the -`apply_immediately` flag to instruct the service to apply the change immediately -(see documentation below). +`apply_immediately` flag to instruct the service to apply the change immediately +(see documentation below). -~> **Note:** using `apply_immediately` can result in a -brief downtime as the server reboots. See the AWS Docs on [RDS Maintenance][2] +~> **Note:** using `apply_immediately` can result in a +brief downtime as the server reboots. See the AWS Docs on [RDS Maintenance][2] for more information. @@ -44,7 +44,7 @@ resource "aws_db_instance" "default" { ## Argument Reference For more detailed documentation about each argument, refer to -the [AWS official documentation](http://docs.aws.amazon.com/AmazonRDS/latest/CommandLineReference/CLIReference-cmd-ModifyDBInstance.html). +the [AWS official documentation](https://docs.aws.amazon.com/AmazonRDS/latest/CommandLineReference/CLIReference-cmd-ModifyDBInstance.html). The following arguments are supported: @@ -76,24 +76,24 @@ the final snapshot (if `final_snapshot_identifier` is specified). Default storage_type of "io1". * `maintenance_window` - (Optional) The window to perform maintenance in. Syntax: "ddd:hh24:mi-ddd:hh24:mi". Eg: "Mon:00:00-Mon:03:00". - See [RDS Maintenance Window docs](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) for more. + See [RDS Maintenance Window docs](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/AdjustingTheMaintenanceWindow.html) for more. * `multi_az` - (Optional) Specifies if the RDS instance is multi-AZ * `port` - (Optional) The port on which the DB accepts connections. * `publicly_accessible` - (Optional) Bool to control if instance is publicly accessible. * `vpc_security_group_ids` - (Optional) List of VPC security groups to associate. * `security_group_names` - (Optional/Deprecated) List of DB Security Groups to associate. - Only used for [DB Instances on the _EC2-Classic_ Platform](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.html#USER_VPC.FindDefaultVPC). + Only used for [DB Instances on the _EC2-Classic_ Platform](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_VPC.html#USER_VPC.FindDefaultVPC). * `db_subnet_group_name` - (Optional) Name of DB subnet group. DB instance will be created in the VPC associated with the DB subnet group. If unspecified, will be created in the `default` VPC, or in EC2 Classic, if available. * `parameter_group_name` - (Optional) Name of the DB parameter group to associate. * `storage_encrypted` - (Optional) Specifies whether the DB instance is encrypted. The default is `false` if not specified. * `apply_immediately` - (Optional) Specifies whether any database modifications are applied immediately, or during the next maintenance window. Default is - `false`. See [Amazon RDS Documentation for more information.](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.DBInstance.Modifying.html) + `false`. See [Amazon RDS Documentation for more information.](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.DBInstance.Modifying.html) * `replicate_source_db` - (Optional) Specifies that this resource is a Replicate database, and to use this value as the source database. This correlates to the `identifier` of another Amazon RDS Database to replicate. See [DB Instance Replication][1] and -[Working with PostgreSQL and MySQL Read Replicas](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html) for +[Working with PostgreSQL and MySQL Read Replicas](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/USER_ReadRepl.html) for more information on using Replication. * `snapshot_identifier` - (Optional) Specifies whether or not to create this database from a snapshot. This correlates to the snapshot ID you'd find in the RDS console, e.g: rds:production-2015-06-26-06-05. * `license_model` - (Optional, but required for some DB engines, i.e. Oracle SE1) License model information for this DB instance. @@ -127,5 +127,5 @@ The following attributes are exported: * `username` - The master username for the database * `storage_encrypted` - Specifies whether the DB instance is encrypted -[1]: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Replication.html -[2]: http://docs.aws.amazon.com/fr_fr/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html +[1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Replication.html +[2]: https://docs.aws.amazon.com/fr_fr/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html diff --git a/website/source/docs/providers/aws/r/dynamodb_table.html.markdown b/website/source/docs/providers/aws/r/dynamodb_table.html.markdown index b2b5f8507..cf84fcc03 100644 --- a/website/source/docs/providers/aws/r/dynamodb_table.html.markdown +++ b/website/source/docs/providers/aws/r/dynamodb_table.html.markdown @@ -13,7 +13,7 @@ Provides a DynamoDB table resource ## Example Usage The following dynamodb table description models the table and GSI shown -in the [AWS SDK example documentation](http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GSI.html) +in the [AWS SDK example documentation](https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/GSI.html) ``` resource "aws_dynamodb_table" "basic-dynamodb-table" { diff --git a/website/source/docs/providers/aws/r/ecs_service.html.markdown b/website/source/docs/providers/aws/r/ecs_service.html.markdown index eb654b43f..b169e0b23 100644 --- a/website/source/docs/providers/aws/r/ecs_service.html.markdown +++ b/website/source/docs/providers/aws/r/ecs_service.html.markdown @@ -12,7 +12,7 @@ description: |- Provides an ECS service - effectively a task that is expected to run until an error occures or user terminates it (typically a webserver or a database). -See [ECS Services section in AWS developer guide](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html). +See [ECS Services section in AWS developer guide](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs_services.html). ## Example Usage diff --git a/website/source/docs/providers/aws/r/ecs_task_definition.html.markdown b/website/source/docs/providers/aws/r/ecs_task_definition.html.markdown index 3c761aa62..31cd1f1ae 100644 --- a/website/source/docs/providers/aws/r/ecs_task_definition.html.markdown +++ b/website/source/docs/providers/aws/r/ecs_task_definition.html.markdown @@ -26,7 +26,7 @@ resource "aws_ecs_task_definition" "jenkins" { ### task-definitions/jenkins.json -The below would be passed into the `container_definitions` attribute. This is a small subset of the available parameters, see the [AWS docs](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html) for a full list. +The below would be passed into the `container_definitions` attribute. This is a small subset of the available parameters, see the [AWS docs](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task_definition_parameters.html) for a full list. ``` [ @@ -51,7 +51,7 @@ The below would be passed into the `container_definitions` attribute. This is a The following arguments are supported: * `family` - (Required) The family, unique name for your task definition. -* `container_definitions` - (Required) A list of container definitions in JSON format. See [AWS docs](http://docs.aws.amazon.com/AmazonECS/latest/developerguide/create-task-definition.html) for syntax. Note, you only need the containerDefinitions array, not the parent hash including the family and volumes keys. +* `container_definitions` - (Required) A list of container definitions in JSON format. See [AWS docs](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/create-task-definition.html) for syntax. Note, you only need the containerDefinitions array, not the parent hash including the family and volumes keys. * `volume` - (Optional) A volume block. Volumes documented below. Volumes support the following: diff --git a/website/source/docs/providers/aws/r/efs_mount_target.html.markdown b/website/source/docs/providers/aws/r/efs_mount_target.html.markdown index c29b1b742..724316c5e 100644 --- a/website/source/docs/providers/aws/r/efs_mount_target.html.markdown +++ b/website/source/docs/providers/aws/r/efs_mount_target.html.markdown @@ -8,7 +8,7 @@ description: |- # aws\_efs\_mount\_target -Provides an EFS mount target. Per [documentation](http://docs.aws.amazon.com/efs/latest/ug/limits.html) +Provides an EFS mount target. Per [documentation](https://docs.aws.amazon.com/efs/latest/ug/limits.html) the limit is 1 mount target per AZ for a single EFS file system. ## Example Usage diff --git a/website/source/docs/providers/aws/r/eip.html.markdown b/website/source/docs/providers/aws/r/eip.html.markdown index 3447228ed..a4d01777a 100644 --- a/website/source/docs/providers/aws/r/eip.html.markdown +++ b/website/source/docs/providers/aws/r/eip.html.markdown @@ -27,7 +27,7 @@ The following arguments are supported: * `instance` - (Optional) EC2 instance ID. * `network_interface` - (Optional) Network interface ID to associate with. -~> **NOTE:** You can specify either the `instance` ID or the `network_interface` ID, +~> **NOTE:** You can specify either the `instance` ID or the `network_interface` ID, but not both. Including both will **not** return an error from the AWS API, but will have undefined behavior. See the relevant [AssociateAddress API Call][1] for more information. @@ -42,5 +42,4 @@ The following attributes are exported: * `instance` - Contains the ID of the attached instance. * `network_interface` - Contains the ID of the attached network interface. - -[1]: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_AssociateAddress.html +[1]: https://docs.aws.amazon.com/fr_fr/AWSEC2/latest/APIReference/API_AssociateAddress.html diff --git a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown index 9726ec61f..5578f19e8 100644 --- a/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown +++ b/website/source/docs/providers/aws/r/elasticache_cluster.html.markdown @@ -14,11 +14,11 @@ Changes to a Cache Cluster can occur when you manually change a parameter, such as `node_type`, and are reflected in the next maintenance window. Because of this, Terraform may report a difference in it's planning phase because a modification has not yet taken place. You can use the -`apply_immediately` flag to instruct the service to apply the change immediately -(see documentation below). +`apply_immediately` flag to instruct the service to apply the change immediately +(see documentation below). -~> **Note:** using `apply_immediately` can result in a -brief downtime as the server reboots. See the AWS Docs on +~> **Note:** using `apply_immediately` can result in a +brief downtime as the server reboots. See the AWS Docs on [Modifying an ElastiCache Cache Cluster][2] for more information. ## Example Usage @@ -45,15 +45,15 @@ The following arguments are supported: Valid values for this parameter are `memcached` or `redis` * `engine_version` – (Optional) Version number of the cache engine to be used. -See [Selecting a Cache Engine and Version](http://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html) +See [Selecting a Cache Engine and Version](https://docs.aws.amazon.com/AmazonElastiCache/latest/UserGuide/SelectEngine.html) in the AWS Documentation center for supported versions -* `maintenance_window` – (Optional) Specifies the weekly time range which maintenance -on the cache cluster is performed. The format is `ddd:hh24:mi-ddd:hh24:mi` (24H Clock UTC). +* `maintenance_window` – (Optional) Specifies the weekly time range which maintenance +on the cache cluster is performed. The format is `ddd:hh24:mi-ddd:hh24:mi` (24H Clock UTC). The minimum maintenance window is a 60 minute period. Example: `sun:05:00-sun:09:00` * `node_type` – (Required) The compute and memory capacity of the nodes. See -[Available Cache Node Types](http://aws.amazon.com/elasticache/details#Available_Cache_Node_Types) for +[Available Cache Node Types](https://aws.amazon.com/elasticache/details#Available_Cache_Node_Types) for supported node types * `num_cache_nodes` – (Required) The initial number of cache nodes that the @@ -81,21 +81,21 @@ names to associate with this cache cluster `false`. See [Amazon ElastiCache Documentation for more information.][1] (Available since v0.6.0) -* `snapshot_arns` – (Optional) A single-element string list containing an -Amazon Resource Name (ARN) of a Redis RDB snapshot file stored in Amazon S3. +* `snapshot_arns` – (Optional) A single-element string list containing an +Amazon Resource Name (ARN) of a Redis RDB snapshot file stored in Amazon S3. Example: `arn:aws:s3:::my_bucket/snapshot1.rdb` -* `snapshot_window` - (Optional) The daily time range (in UTC) during which ElastiCache will +* `snapshot_window` - (Optional) The daily time range (in UTC) during which ElastiCache will begin taking a daily snapshot of your cache cluster. Can only be used for the Redis engine. Example: 05:00-09:00 -* `snapshot_retention_limit` - (Optional) The number of days for which ElastiCache will -retain automatic cache cluster snapshots before deleting them. For example, if you set -SnapshotRetentionLimit to 5, then a snapshot that was taken today will be retained for 5 days -before being deleted. If the value of SnapshotRetentionLimit is set to zero (0), backups are turned off. +* `snapshot_retention_limit` - (Optional) The number of days for which ElastiCache will +retain automatic cache cluster snapshots before deleting them. For example, if you set +SnapshotRetentionLimit to 5, then a snapshot that was taken today will be retained for 5 days +before being deleted. If the value of SnapshotRetentionLimit is set to zero (0), backups are turned off. Can only be used for the Redis engine. -* `notification_topic_arn` – (Optional) An Amazon Resource Name (ARN) of an -SNS topic to send ElastiCache notifications to. Example: +* `notification_topic_arn` – (Optional) An Amazon Resource Name (ARN) of an +SNS topic to send ElastiCache notifications to. Example: `arn:aws:sns:us-east-1:012345678999:my_sns_topic` * `az_mode` - (Optional, Memcached only) Specifies whether the nodes in this Memcached node group are created in a single Availability Zone or created across multiple Availability Zones in the cluster's region. Valid values for this parameter are `single-az` or `cross-az`, default is `single-az`. If you want to choose `cross-az`, `num_cache_nodes` must be greater than `1`. @@ -114,8 +114,8 @@ The following attributes are exported: * `cache_nodes` - List of node objects including `id`, `address`, `port` and `availability_zone`. Referenceable e.g. as `${aws_elasticache_cluster.bar.cache_nodes.0.address}` - + * `configuration_endpoint` - (Memcached only) The configuration endpoint to allow host discovery -[1]: http://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyCacheCluster.html -[2]: http://docs.aws.amazon.com/fr_fr/AmazonElastiCache/latest/UserGuide/Clusters.Modify.html +[1]: https://docs.aws.amazon.com/AmazonElastiCache/latest/APIReference/API_ModifyCacheCluster.html +[2]: https://docs.aws.amazon.com/fr_fr/AmazonElastiCache/latest/UserGuide/Clusters.Modify.html diff --git a/website/source/docs/providers/aws/r/glacier_vault.html.markdown b/website/source/docs/providers/aws/r/glacier_vault.html.markdown index d783c0226..c0b6d8685 100644 --- a/website/source/docs/providers/aws/r/glacier_vault.html.markdown +++ b/website/source/docs/providers/aws/r/glacier_vault.html.markdown @@ -8,7 +8,7 @@ description: |- # aws\_glacier\_vault -Provides a Glacier Vault Resource. You can refer to the [Glacier Developer Guide](http://docs.aws.amazon.com/amazonglacier/latest/dev/working-with-vaults.html) for a full explanation of the Glacier Vault functionality +Provides a Glacier Vault Resource. You can refer to the [Glacier Developer Guide](https://docs.aws.amazon.com/amazonglacier/latest/dev/working-with-vaults.html) for a full explanation of the Glacier Vault functionality ~> **NOTE:** When removing a Glacier Vault, the Vault must be empty. diff --git a/website/source/docs/providers/aws/r/iam_group.html.markdown b/website/source/docs/providers/aws/r/iam_group.html.markdown index 458234ac7..692dc3d49 100644 --- a/website/source/docs/providers/aws/r/iam_group.html.markdown +++ b/website/source/docs/providers/aws/r/iam_group.html.markdown @@ -36,4 +36,4 @@ The following attributes are exported: * `path` - The path of the group in IAM. * `unique_id` - The [unique ID][1] assigned by AWS. - [1]: http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs + [1]: https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs diff --git a/website/source/docs/providers/aws/r/iam_instance_profile.html.markdown b/website/source/docs/providers/aws/r/iam_instance_profile.html.markdown index f9b05f66f..aaed8cf53 100644 --- a/website/source/docs/providers/aws/r/iam_instance_profile.html.markdown +++ b/website/source/docs/providers/aws/r/iam_instance_profile.html.markdown @@ -55,4 +55,4 @@ The following arguments are supported: * `roles` - The list of roles assigned to the instance profile. * `unique_id` - The [unique ID][1] assigned by AWS. - [1]: http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs + [1]: https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs diff --git a/website/source/docs/providers/aws/r/iam_role.html.markdown b/website/source/docs/providers/aws/r/iam_role.html.markdown index d7292a9a7..7a5d0df17 100644 --- a/website/source/docs/providers/aws/r/iam_role.html.markdown +++ b/website/source/docs/providers/aws/r/iam_role.html.markdown @@ -40,7 +40,7 @@ The following arguments are supported: * `name` - (Required) The name of the role. * `assume_role_policy` - (Required) The policy that grants an entity permission to assume the role. * `path` - (Optional) The path to the role. - See [IAM Identifiers](http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html) for more information. + See [IAM Identifiers](https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html) for more information. ## Attributes Reference diff --git a/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown b/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown index 8fe189887..61b49a96b 100644 --- a/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown +++ b/website/source/docs/providers/aws/r/iam_server_certificate.html.markdown @@ -100,5 +100,5 @@ The following arguments are supported: * `arn` - The Amazon Resource Name (ARN) specifying the server certificate. -[1]: http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html -[2]: http://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingServerCerts.html +[1]: https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html +[2]: https://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingServerCerts.html diff --git a/website/source/docs/providers/aws/r/iam_user.html.markdown b/website/source/docs/providers/aws/r/iam_user.html.markdown index a8b21c29a..ef53316e8 100644 --- a/website/source/docs/providers/aws/r/iam_user.html.markdown +++ b/website/source/docs/providers/aws/r/iam_user.html.markdown @@ -56,4 +56,4 @@ The following attributes are exported: * `unique_id` - The [unique ID][1] assigned by AWS. * `arn` - The ARN assigned by AWS for this user. - [1]: http://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs + [1]: https://docs.aws.amazon.com/IAM/latest/UserGuide/Using_Identifiers.html#GUIDs diff --git a/website/source/docs/providers/aws/r/instance.html.markdown b/website/source/docs/providers/aws/r/instance.html.markdown index 5e35161e3..2cca6e819 100644 --- a/website/source/docs/providers/aws/r/instance.html.markdown +++ b/website/source/docs/providers/aws/r/instance.html.markdown @@ -44,7 +44,7 @@ The following arguments are supported: * `instance_initiated_shutdown_behavior` - (Optional) Shutdown behavior for the instance. Amazon defaults this to `stop` for EBS-backed instances and `terminate` for instance-store instances. Cannot be set on instance-store -instances. See [Shutdown Behavior](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/terminating-instances.html#Using_ChangingInstanceInitiatedShutdownBehavior) for more information. +instances. See [Shutdown Behavior](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/terminating-instances.html#Using_ChangingInstanceInitiatedShutdownBehavior) for more information. * `instance_type` - (Required) The type of instance to start * `key_name` - (Optional) The key name to use for the instance. * `monitoring` - (Optional) If true, the launched EC2 instance will have detailed monitoring enabled. (Available since v0.6.0) @@ -74,7 +74,7 @@ instances. See [Shutdown Behavior](http://docs.aws.amazon.com/AWSEC2/latest/User Each of the `*_block_device` attributes controls a portion of the AWS Instance's "Block Device Mapping". It's a good idea to familiarize yourself with [AWS's Block Device -Mapping docs](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html) +Mapping docs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html) to understand the implications of using these attributes. The `root_block_device` mapping supports the following: @@ -83,7 +83,7 @@ The `root_block_device` mapping supports the following: or `"io1"`. (Default: `"standard"`). * `volume_size` - (Optional) The size of the volume in gigabytes. * `iops` - (Optional) The amount of provisioned - [IOPS](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). + [IOPS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). This must be set with a `volume_type` of `"io1"`. * `delete_on_termination` - (Optional) Whether the volume should be destroyed on instance termination (Default: `true`). @@ -99,12 +99,12 @@ Each `ebs_block_device` supports the following: or `"io1"`. (Default: `"standard"`). * `volume_size` - (Optional) The size of the volume in gigabytes. * `iops` - (Optional) The amount of provisioned - [IOPS](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). + [IOPS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). This must be set with a `volume_type` of `"io1"`. * `delete_on_termination` - (Optional) Whether the volume should be destroyed on instance termination (Default: `true`). * `encrypted` - (Optional) Enables [EBS - encryption](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html) + encryption](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/EBSEncryption.html) on the volume (Default: `false`). Cannot be used with `snapshot_id`. Modifying any `ebs_block_device` currently requires resource replacement. @@ -113,12 +113,12 @@ Each `ephemeral_block_device` supports the following: * `device_name` - The name of the block device to mount on the instance. * `virtual_name` - The [Instance Store Device - Name](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#InstanceStoreDeviceNames) + Name](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#InstanceStoreDeviceNames) (e.g. `"ephemeral0"`) Each AWS Instance type has a different set of Instance Store block devices available for attachment. AWS [publishes a -list](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#StorageOnInstanceTypes) +list](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#StorageOnInstanceTypes) of which ephemeral devices are available on each type. The devices are always identified by the `virtual_name` in the format `"ephemeral{0..N}"`. diff --git a/website/source/docs/providers/aws/r/key_pair.html.markdown b/website/source/docs/providers/aws/r/key_pair.html.markdown index abd54ea11..df2e3200f 100644 --- a/website/source/docs/providers/aws/r/key_pair.html.markdown +++ b/website/source/docs/providers/aws/r/key_pair.html.markdown @@ -8,11 +8,11 @@ description: |- # aws\_key\_pair -Provides an [EC2 key pair](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html) resource. A key pair is used to control login access to EC2 instances. +Provides an [EC2 key pair](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html) resource. A key pair is used to control login access to EC2 instances. Currently this resource only supports importing an existing key pair, not creating a new key pair. -When importing an existing key pair the public key material may be in any format supported by AWS. Supported formats (per the [AWS documentation](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#how-to-generate-your-own-key-and-import-it-to-aws)) are: +When importing an existing key pair the public key material may be in any format supported by AWS. Supported formats (per the [AWS documentation](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ec2-key-pairs.html#how-to-generate-your-own-key-and-import-it-to-aws)) are: * OpenSSH public key format (the format in ~/.ssh/authorized_keys) * Base64 encoded DER format diff --git a/website/source/docs/providers/aws/r/kinesis_firehose_delivery_stream.html.markdown b/website/source/docs/providers/aws/r/kinesis_firehose_delivery_stream.html.markdown index 61a6c62b5..3cfa4c525 100644 --- a/website/source/docs/providers/aws/r/kinesis_firehose_delivery_stream.html.markdown +++ b/website/source/docs/providers/aws/r/kinesis_firehose_delivery_stream.html.markdown @@ -53,7 +53,7 @@ resource "aws_kinesis_firehose_delivery_stream" "test_stream" { The following arguments are supported: -* `name` - (Required) A name to identify the stream. This is unique to the +* `name` - (Required) A name to identify the stream. This is unique to the AWS account and region the Stream is created in. * `destination` – (Required) This is the destination to where the data is delivered. The only options are `s3` & `redshift` * `role_arn` - (Required) The ARN of the AWS credentials. @@ -62,11 +62,11 @@ AWS account and region the Stream is created in. * `s3_buffer_size` - (Optional) Buffer incoming data to the specified size, in MBs, before delivering it to the destination. The default value is 5. We recommend setting SizeInMBs to a value greater than the amount of data you typically ingest into the delivery stream in 10 seconds. For example, if you typically ingest data at 1 MB/sec set SizeInMBs to be 10 MB or highe * `s3_buffer_interval` - (Optional) Buffer incoming data for the specified period of time, in seconds, before delivering it to the destination. The default value is 300 -* `s3_data_compression` - (Optional) The compression format. If no value is specified, the default is NOCOMPRESSION. Other supported values are GZIP, ZIP & Snappy +* `s3_data_compression` - (Optional) The compression format. If no value is specified, the default is NOCOMPRESSION. Other supported values are GZIP, ZIP & Snappy ## Attributes Reference * `arn` - The Amazon Resource Name (ARN) specifying the Stream -[1]: http://aws.amazon.com/documentation/firehose/ +[1]: https://aws.amazon.com/documentation/firehose/ diff --git a/website/source/docs/providers/aws/r/kinesis_stream.html.markdown b/website/source/docs/providers/aws/r/kinesis_stream.html.markdown index b1ef96299..b46752a00 100644 --- a/website/source/docs/providers/aws/r/kinesis_stream.html.markdown +++ b/website/source/docs/providers/aws/r/kinesis_stream.html.markdown @@ -44,5 +44,5 @@ when creating a Kinesis stream. See [Amazon Kinesis Streams][2] for more. * `arn` - The Amazon Resource Name (ARN) specifying the Stream -[1]: http://aws.amazon.com/documentation/kinesis/ -[2]: http://docs.aws.amazon.com/kinesis/latest/dev/amazon-kinesis-streams.html +[1]: https://aws.amazon.com/documentation/kinesis/ +[2]: https://docs.aws.amazon.com/kinesis/latest/dev/amazon-kinesis-streams.html diff --git a/website/source/docs/providers/aws/r/lambda_function.html.markdown b/website/source/docs/providers/aws/r/lambda_function.html.markdown index c4e86a0a4..5bc79c0fc 100644 --- a/website/source/docs/providers/aws/r/lambda_function.html.markdown +++ b/website/source/docs/providers/aws/r/lambda_function.html.markdown @@ -61,10 +61,9 @@ resource "aws_lambda_function" "test_lambda" { * `arn` - The Amazon Resource Name (ARN) identifying your Lambda Function. * `last_modified` - The date this resource was last modified. - -[1]: http://docs.aws.amazon.com/lambda/latest/dg/welcome.html -[2]: http://docs.aws.amazon.com/lambda/latest/dg/walkthrough-s3-events-adminuser-create-test-function-create-function.html -[3]: http://docs.aws.amazon.com/lambda/latest/dg/walkthrough-custom-events-create-test-function.html -[4]: http://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html -[5]: http://docs.aws.amazon.com/lambda/latest/dg/limits.html +[1]: https://docs.aws.amazon.com/lambda/latest/dg/welcome.html +[2]: https://docs.aws.amazon.com/lambda/latest/dg/walkthrough-s3-events-adminuser-create-test-function-create-function.html +[3]: https://docs.aws.amazon.com/lambda/latest/dg/walkthrough-custom-events-create-test-function.html +[4]: https://docs.aws.amazon.com/lambda/latest/dg/intro-permission-model.html +[5]: https://docs.aws.amazon.com/lambda/latest/dg/limits.html [6]: https://docs.aws.amazon.com/lambda/latest/dg/API_CreateFunction.html#API_CreateFunction_RequestBody diff --git a/website/source/docs/providers/aws/r/launch_configuration.html.markdown b/website/source/docs/providers/aws/r/launch_configuration.html.markdown index 3713923e8..59ac6252a 100644 --- a/website/source/docs/providers/aws/r/launch_configuration.html.markdown +++ b/website/source/docs/providers/aws/r/launch_configuration.html.markdown @@ -111,7 +111,7 @@ The following arguments are supported: Each of the `*_block_device` attributes controls a portion of the AWS Launch Configuration's "Block Device Mapping". It's a good idea to familiarize yourself with [AWS's Block Device -Mapping docs](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html) +Mapping docs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/block-device-mapping-concepts.html) to understand the implications of using these attributes. The `root_block_device` mapping supports the following: @@ -120,7 +120,7 @@ The `root_block_device` mapping supports the following: or `"io1"`. (Default: `"standard"`). * `volume_size` - (Optional) The size of the volume in gigabytes. * `iops` - (Optional) The amount of provisioned - [IOPS](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). + [IOPS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). This must be set with a `volume_type` of `"io1"`. * `delete_on_termination` - (Optional) Whether the volume should be destroyed on instance termination (Default: `true`). @@ -136,7 +136,7 @@ Each `ebs_block_device` supports the following: or `"io1"`. (Default: `"standard"`). * `volume_size` - (Optional) The size of the volume in gigabytes. * `iops` - (Optional) The amount of provisioned - [IOPS](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). + [IOPS](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-io-characteristics.html). This must be set with a `volume_type` of `"io1"`. * `delete_on_termination` - (Optional) Whether the volume should be destroyed on instance termination (Default: `true`). @@ -147,12 +147,12 @@ Each `ephemeral_block_device` supports the following: * `device_name` - The name of the block device to mount on the instance. * `virtual_name` - The [Instance Store Device - Name](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#InstanceStoreDeviceNames) + Name](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#InstanceStoreDeviceNames) (e.g. `"ephemeral0"`) Each AWS Instance type has a different set of Instance Store block devices available for attachment. AWS [publishes a -list](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#StorageOnInstanceTypes) +list](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/InstanceStorage.html#StorageOnInstanceTypes) of which ephemeral devices are available on each type. The devices are always identified by the `virtual_name` in the format `"ephemeral{0..N}"`. diff --git a/website/source/docs/providers/aws/r/placement_group.html.markdown b/website/source/docs/providers/aws/r/placement_group.html.markdown index e4ad98df8..1e7c024fa 100644 --- a/website/source/docs/providers/aws/r/placement_group.html.markdown +++ b/website/source/docs/providers/aws/r/placement_group.html.markdown @@ -9,7 +9,7 @@ description: |- # aws\_placement\_group Provides an EC2 placement group. Read more about placement groups -in [AWS Docs](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html). +in [AWS Docs](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/placement-groups.html). ## Example Usage diff --git a/website/source/docs/providers/aws/r/rds_cluster.html.markdown b/website/source/docs/providers/aws/r/rds_cluster.html.markdown index 832dd3101..cd843a16e 100644 --- a/website/source/docs/providers/aws/r/rds_cluster.html.markdown +++ b/website/source/docs/providers/aws/r/rds_cluster.html.markdown @@ -46,7 +46,7 @@ RDS Cluster Instances do not currently display in the AWS Console. ## Argument Reference For more detailed documentation about each argument, refer to -the [AWS official documentation](http://docs.aws.amazon.com/AmazonRDS/latest/CommandLineReference/CLIReference-cmd-ModifyDBInstance.html). +the [AWS official documentation](https://docs.aws.amazon.com/AmazonRDS/latest/CommandLineReference/CLIReference-cmd-ModifyDBInstance.html). The following arguments are supported: @@ -73,7 +73,7 @@ Default: A 30-minute window selected at random from an 8-hour block of time per with the Cluster * `apply_immediately` - (Optional) Specifies whether any cluster modifications are applied immediately, or during the next maintenance window. Default is - `false`. See [Amazon RDS Documentation for more information.](http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.DBInstance.Modifying.html) + `false`. See [Amazon RDS Documentation for more information.](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.DBInstance.Modifying.html) * `db_subnet_group_name` - (Optional) A DB subnet group to associate with this DB instance. ## Attributes Reference @@ -100,8 +100,8 @@ The following attributes are exported: * `storage_encrypted` - Specifies whether the DB instance is encrypted * `preferred_backup_window` - The daily time range during which the backups happen -[1]: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Replication.html +[1]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Overview.Replication.html -[2]: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html +[2]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html [3]: /docs/providers/aws/r/rds_cluster_instance.html [4]: http://docs.aws.amazon.com/fr_fr/AmazonRDS/latest/UserGuide/USER_UpgradeDBInstance.Maintenance.html diff --git a/website/source/docs/providers/aws/r/rds_cluster_instance.html.markdown b/website/source/docs/providers/aws/r/rds_cluster_instance.html.markdown index 893c96d88..2580ff71c 100644 --- a/website/source/docs/providers/aws/r/rds_cluster_instance.html.markdown +++ b/website/source/docs/providers/aws/r/rds_cluster_instance.html.markdown @@ -43,7 +43,7 @@ resource "aws_rds_cluster" "default" { ## Argument Reference For more detailed documentation about each argument, refer to -the [AWS official documentation](http://docs.aws.amazon.com/AmazonRDS/latest/CommandLineReference/CLIReference-cmd-ModifyDBInstance.html). +the [AWS official documentation](https://docs.aws.amazon.com/AmazonRDS/latest/CommandLineReference/CLIReference-cmd-ModifyDBInstance.html). The following arguments are supported: @@ -86,8 +86,8 @@ this instance is a read replica * `port` - The database port * `status` - The RDS instance status -[2]: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html +[2]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/CHAP_Aurora.html [3]: /docs/providers/aws/r/rds_cluster.html -[4]: http://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html +[4]: https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Aurora.Managing.html [5]: /docs/configuration/resources.html#count -[6]: http://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html +[6]: https://docs.aws.amazon.com/AmazonRDS/latest/APIReference/API_CreateDBInstance.html diff --git a/website/source/docs/providers/aws/r/route53_delegation_set.html.markdown b/website/source/docs/providers/aws/r/route53_delegation_set.html.markdown index 907000077..cf6ddb59e 100644 --- a/website/source/docs/providers/aws/r/route53_delegation_set.html.markdown +++ b/website/source/docs/providers/aws/r/route53_delegation_set.html.markdown @@ -8,7 +8,7 @@ description: |- # aws\_route53\_delegation_set -Provides a [Route53 Delegation Set](http://docs.aws.amazon.com/Route53/latest/APIReference/actions-on-reusable-delegation-sets.html) resource. +Provides a [Route53 Delegation Set](https://docs.aws.amazon.com/Route53/latest/APIReference/actions-on-reusable-delegation-sets.html) resource. ## Example Usage diff --git a/website/source/docs/providers/aws/r/route53_record.html.markdown b/website/source/docs/providers/aws/r/route53_record.html.markdown index 11b4b5c59..e099eb9cd 100644 --- a/website/source/docs/providers/aws/r/route53_record.html.markdown +++ b/website/source/docs/providers/aws/r/route53_record.html.markdown @@ -25,7 +25,7 @@ resource "aws_route53_record" "www" { ``` ### Weighted routing policy -See [AWS Route53 Developer Guide](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted) for details. +See [AWS Route53 Developer Guide](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/routing-policy.html#routing-policy-weighted) for details. ``` resource "aws_route53_record" "www-dev" { @@ -50,10 +50,10 @@ resource "aws_route53_record" "www-live" { ``` ### Alias record -See [related part of AWS Route53 Developer Guide](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-choosing-alias-non-alias.html) +See [related part of AWS Route53 Developer Guide](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-choosing-alias-non-alias.html) to understand differences between alias and non-alias records. -TTL for all alias records is [60 seconds](http://aws.amazon.com/route53/faqs/#dns_failover_do_i_need_to_adjust), +TTL for all alias records is [60 seconds](https://aws.amazon.com/route53/faqs/#dns_failover_do_i_need_to_adjust), you cannot change this, therefore `ttl` has to be omitted in alias records. ``` @@ -111,9 +111,9 @@ Alias records support the following: * `name` - (Required) DNS domain name for a CloudFront distribution, S3 bucket, ELB, or another resource record set in this hosted zone. * `zone_id` - (Required) Hosted zone ID for a CloudFront distribution, S3 bucket, ELB, or Route 53 hosted zone. See [`resource_elb.zone_id`](/docs/providers/aws/r/elb.html#zone_id) for example. -* `evaluate_target_health` - (Required) Set to `true` if you want Route 53 to determine whether to respond to DNS queries using this resource record set by checking the health of the resource record set. Some resources have special requirements, see [related part of documentation](http://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-values.html#rrsets-values-alias-evaluate-target-health). +* `evaluate_target_health` - (Required) Set to `true` if you want Route 53 to determine whether to respond to DNS queries using this resource record set by checking the health of the resource record set. Some resources have special requirements, see [related part of documentation](https://docs.aws.amazon.com/Route53/latest/DeveloperGuide/resource-record-sets-values.html#rrsets-values-alias-evaluate-target-health). ## Attributes Reference -* `fqdn` - [FQDN](http://en.wikipedia.org/wiki/Fully_qualified_domain_name) built using the zone domain and `name` +* `fqdn` - [FQDN](https://en.wikipedia.org/wiki/Fully_qualified_domain_name) built using the zone domain and `name` diff --git a/website/source/docs/providers/aws/r/route53_zone.html.markdown b/website/source/docs/providers/aws/r/route53_zone.html.markdown index 2533a76c2..ed8ad5416 100644 --- a/website/source/docs/providers/aws/r/route53_zone.html.markdown +++ b/website/source/docs/providers/aws/r/route53_zone.html.markdown @@ -66,4 +66,4 @@ The following attributes are exported: * `zone_id` - The Hosted Zone ID. This can be referenced by zone records. * `name_servers` - A list of name servers in associated (or default) delegation set. - Find more about delegation sets in [AWS docs](http://docs.aws.amazon.com/Route53/latest/APIReference/actions-on-reusable-delegation-sets.html). + Find more about delegation sets in [AWS docs](https://docs.aws.amazon.com/Route53/latest/APIReference/actions-on-reusable-delegation-sets.html). diff --git a/website/source/docs/providers/aws/r/s3_bucket.html.markdown b/website/source/docs/providers/aws/r/s3_bucket.html.markdown index 926e9f5d1..75216ff99 100644 --- a/website/source/docs/providers/aws/r/s3_bucket.html.markdown +++ b/website/source/docs/providers/aws/r/s3_bucket.html.markdown @@ -92,15 +92,15 @@ resource "aws_s3_bucket" "b" { The following arguments are supported: * `bucket` - (Required) The name of the bucket. -* `acl` - (Optional) The [canned ACL](http://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to apply. Defaults to "private". -* `policy` - (Optional) A valid [bucket policy](http://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html) JSON document. Note that if the policy document is not specific enough (but still valid), Terraform may view the policy as constantly changing in a `terraform plan`. In this case, please make sure you use the verbose/specific version of the policy. +* `acl` - (Optional) The [canned ACL](https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl) to apply. Defaults to "private". +* `policy` - (Optional) A valid [bucket policy](https://docs.aws.amazon.com/AmazonS3/latest/dev/example-bucket-policies.html) JSON document. Note that if the policy document is not specific enough (but still valid), Terraform may view the policy as constantly changing in a `terraform plan`. In this case, please make sure you use the verbose/specific version of the policy. * `tags` - (Optional) A mapping of tags to assign to the bucket. * `force_destroy` - (Optional, Default:false ) A boolean that indicates all objects should be deleted from the bucket so that the bucket can be destroyed without error. These objects are *not* recoverable. * `website` - (Optional) A website object (documented below). -* `cors_rule` - (Optional) A rule of [Cross-Origin Resource Sharing](http://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html) (documented below). -* `versioning` - (Optional) A state of [versioning](http://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html) (documented below) -* `logging` - (Optional) A settings of [bucket logging](http://docs.aws.amazon.com/AmazonS3/latest/UG/ManagingBucketLogging.html) (documented below). +* `cors_rule` - (Optional) A rule of [Cross-Origin Resource Sharing](https://docs.aws.amazon.com/AmazonS3/latest/dev/cors.html) (documented below). +* `versioning` - (Optional) A state of [versioning](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html) (documented below) +* `logging` - (Optional) A settings of [bucket logging](https://docs.aws.amazon.com/AmazonS3/latest/UG/ManagingBucketLogging.html) (documented below). The `website` object supports the following: @@ -131,7 +131,7 @@ The following attributes are exported: * `id` - The name of the bucket. * `arn` - The ARN of the bucket. Will be of format `arn:aws:s3:::bucketname` -* `hosted_zone_id` - The [Route 53 Hosted Zone ID](http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_website_region_endpoints) for this bucket's region. +* `hosted_zone_id` - The [Route 53 Hosted Zone ID](https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_website_region_endpoints) for this bucket's region. * `region` - The AWS region this bucket resides in. * `website_endpoint` - The website endpoint, if the bucket is configured with a website. If not, this will be an empty string. * `website_domain` - The domain of the website endpoint, if the bucket is configured with a website. If not, this will be an empty string. This is used to create Route 53 alias records. diff --git a/website/source/docs/providers/aws/r/spot_instance_request.html.markdown b/website/source/docs/providers/aws/r/spot_instance_request.html.markdown index 7f8fd9f0f..8570464a3 100644 --- a/website/source/docs/providers/aws/r/spot_instance_request.html.markdown +++ b/website/source/docs/providers/aws/r/spot_instance_request.html.markdown @@ -68,7 +68,7 @@ These attributes are exported, but they are expected to change over time and so should only be used for informational purposes, not for resource dependencies: * `spot_bid_status` - The current [bid - status](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html) + status](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-bid-status.html) of the Spot Instance Request. * `spot_request_state` The current [request state](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-requests.html#creating-spot-request-status) diff --git a/website/source/docs/providers/aws/r/sqs_queue.html.markdown b/website/source/docs/providers/aws/r/sqs_queue.html.markdown index 62666b188..3f33b6dfe 100644 --- a/website/source/docs/providers/aws/r/sqs_queue.html.markdown +++ b/website/source/docs/providers/aws/r/sqs_queue.html.markdown @@ -26,13 +26,13 @@ resource "aws_sqs_queue" "terraform_queue" { The following arguments are supported: * `name` - (Required) This is the human-readable name of the queue -* `visibility_timeout_seconds` - (Optional) The visibility timeout for the queue. An integer from 0 to 43200 (12 hours). The default for this attribute is 30. For more information about visibility timeout, see [AWS docs](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/AboutVT.html). +* `visibility_timeout_seconds` - (Optional) The visibility timeout for the queue. An integer from 0 to 43200 (12 hours). The default for this attribute is 30. For more information about visibility timeout, see [AWS docs](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/AboutVT.html). * `message_retention_seconds` - (Optional) The number of seconds Amazon SQS retains a message. Integer representing seconds, from 60 (1 minute) to 1209600 (14 days). The default for this attribute is 345600 (4 days). * `max_message_size` - (Optional) The limit of how many bytes a message can contain before Amazon SQS rejects it. An integer from 1024 bytes (1 KiB) up to 262144 bytes (256 KiB). The default for this attribute is 262144 (256 KiB). * `delay_seconds` - (Optional) The time in seconds that the delivery of all messages in the queue will be delayed. An integer from 0 to 900 (15 minutes). The default for this attribute is 0 seconds. * `receive_wait_time_seconds` - (Optional) The time for which a ReceiveMessage call will wait for a message to arrive (long polling) before returning. An integer from 0 to 20 (seconds). The default for this attribute is 0, meaning that the call will return immediately. * `policy` - (Optional) The JSON policy for the SQS queue -* `redrive_policy` - (Optional) The JSON policy to set up the Dead Letter Queue, see [AWS docs](http://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/SQSDeadLetterQueue.html). +* `redrive_policy` - (Optional) The JSON policy to set up the Dead Letter Queue, see [AWS docs](https://docs.aws.amazon.com/AWSSimpleQueueService/latest/SQSDeveloperGuide/SQSDeadLetterQueue.html). ## Attributes Reference diff --git a/website/source/docs/providers/aws/r/volume_attachment.html.markdown b/website/source/docs/providers/aws/r/volume_attachment.html.markdown index d3421dc8c..ccc682190 100644 --- a/website/source/docs/providers/aws/r/volume_attachment.html.markdown +++ b/website/source/docs/providers/aws/r/volume_attachment.html.markdown @@ -54,4 +54,4 @@ as a last resort, as this can result in **data loss**. See * `instance_id` - ID of the Instance * `volume_id` - ID of the Volume -[1]: http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-detaching-volume.html +[1]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-detaching-volume.html diff --git a/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown b/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown index c2e05743f..a890ebdc7 100644 --- a/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown +++ b/website/source/docs/providers/aws/r/vpc_dhcp_options.html.markdown @@ -60,4 +60,4 @@ The following attributes are exported: * `id` - The ID of the DHCP Options Set. You can find more technical documentation about DHCP Options Set in the -official [AWS User Guide](http://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_DHCP_Options.html). +official [AWS User Guide](https://docs.aws.amazon.com/AmazonVPC/latest/UserGuide/VPC_DHCP_Options.html). diff --git a/website/source/docs/providers/azure/r/affinity_group.html.markdown b/website/source/docs/providers/azure/r/affinity_group.html.markdown index 906f73070..31b001558 100644 --- a/website/source/docs/providers/azure/r/affinity_group.html.markdown +++ b/website/source/docs/providers/azure/r/affinity_group.html.markdown @@ -29,7 +29,7 @@ The following arguments are supported: Azure subscription. * `location` - (Required) The location where the affinity group should be created. - For a list of all Azure locations, please consult [this link](http://azure.microsoft.com/en-us/regions/). + For a list of all Azure locations, please consult [this link](https://azure.microsoft.com/en-us/regions/). * `label` - (Required) A label to be used for tracking purposes. diff --git a/website/source/docs/providers/azure/r/hosted_service.html.markdown b/website/source/docs/providers/azure/r/hosted_service.html.markdown index 56a946315..04d5ea817 100644 --- a/website/source/docs/providers/azure/r/hosted_service.html.markdown +++ b/website/source/docs/providers/azure/r/hosted_service.html.markdown @@ -29,7 +29,7 @@ The following arguments are supported: * `name` - (Required) The name of the hosted service. Must be unique on Azure. * `location` - (Required) The location where the hosted service should be created. - For a list of all Azure locations, please consult [this link](http://azure.microsoft.com/en-us/regions/). + For a list of all Azure locations, please consult [this link](https://azure.microsoft.com/en-us/regions/). * `ephemeral_contents` - (Required) A boolean value (true|false), specifying whether all the resources present in the hosted hosted service should be diff --git a/website/source/docs/providers/azure/r/sql_database_server.html.markdown b/website/source/docs/providers/azure/r/sql_database_server.html.markdown index c03873181..0974a3e3d 100644 --- a/website/source/docs/providers/azure/r/sql_database_server.html.markdown +++ b/website/source/docs/providers/azure/r/sql_database_server.html.markdown @@ -31,7 +31,7 @@ The following arguments are supported: creation as it is randomly-generated per server. * `location` - (Required) The location where the database server should be created. - For a list of all Azure locations, please consult [this link](http://azure.microsoft.com/en-us/regions/). + For a list of all Azure locations, please consult [this link](https://azure.microsoft.com/en-us/regions/). * `username` - (Required) The username for the administrator of the database server. diff --git a/website/source/docs/providers/azure/r/storage_service.html.markdown b/website/source/docs/providers/azure/r/storage_service.html.markdown index 213965f99..bdc1cdd69 100644 --- a/website/source/docs/providers/azure/r/storage_service.html.markdown +++ b/website/source/docs/providers/azure/r/storage_service.html.markdown @@ -29,7 +29,7 @@ The following arguments are supported: lowercase-only characters or digits. Must be unique on Azure. * `location` - (Required) The location where the storage service should be created. - For a list of all Azure locations, please consult [this link](http://azure.microsoft.com/en-us/regions/). + For a list of all Azure locations, please consult [this link](https://azure.microsoft.com/en-us/regions/). * `account_type` - (Required) The type of storage account to be created. Available options include `Standard_LRS`, `Standard_ZRS`, `Standard_GRS`, diff --git a/website/source/docs/providers/google/r/compute_target_http_proxy.html.markdown b/website/source/docs/providers/google/r/compute_target_http_proxy.html.markdown index 9734f6ff8..c0199fd38 100644 --- a/website/source/docs/providers/google/r/compute_target_http_proxy.html.markdown +++ b/website/source/docs/providers/google/r/compute_target_http_proxy.html.markdown @@ -10,8 +10,8 @@ description: |- Creates a target HTTP proxy resource in GCE. For more information see [the official -documentation](http://cloud.google.com/compute/docs/load-balancing/http/target-proxies) and -[API](http://cloud.google.com/compute/docs/reference/latest/targetHttpProxies). +documentation](https://cloud.google.com/compute/docs/load-balancing/http/target-proxies) and +[API](https://cloud.google.com/compute/docs/reference/latest/targetHttpProxies). ## Example Usage diff --git a/website/source/downloads.html.erb b/website/source/downloads.html.erb index 411d84b03..7849b7e37 100644 --- a/website/source/downloads.html.erb +++ b/website/source/downloads.html.erb @@ -25,7 +25,7 @@ description: |- verify the checksums signature file - which has been signed using HashiCorp's PGP key. + which has been signed using HashiCorp's GPG key. You can also download older versions of Terraform from the releases service.

diff --git a/website/source/intro/getting-started/build.html.md b/website/source/intro/getting-started/build.html.md index a40369fad..970689c03 100644 --- a/website/source/intro/getting-started/build.html.md +++ b/website/source/intro/getting-started/build.html.md @@ -12,7 +12,7 @@ With Terraform installed, let's dive right into it and start creating some infrastructure. We'll build infrastructure on -[AWS](http://aws.amazon.com) for the getting started guide +[AWS](https://aws.amazon.com) for the getting started guide since it is popular and generally understood, but Terraform can [manage many providers](/docs/providers/index.html), including multiple providers in a single configuration. @@ -20,17 +20,17 @@ Some examples of this are in the [use cases section](/intro/use-cases.html). If you don't have an AWS account, -[create one now](http://aws.amazon.com/free/). +[create one now](https://aws.amazon.com/free/). For the getting started guide, we'll only be using resources which qualify under the AWS -[free-tier](http://aws.amazon.com/free/), +[free-tier](https://aws.amazon.com/free/), meaning it will be free. If you already have an AWS account, you may be charged some amount of money, but it shouldn't be more than a few dollars at most. ~> **Warning!** If you're not using an account that qualifies under the AWS -[free-tier](http://aws.amazon.com/free/), you may be charged to run these +[free-tier](https://aws.amazon.com/free/), you may be charged to run these examples. The most you should be charged should only be a few dollars, but we're not responsible for any charges that may incur. diff --git a/website/source/intro/getting-started/dependencies.html.md b/website/source/intro/getting-started/dependencies.html.md index 42d5392a8..bd9eeccf9 100644 --- a/website/source/intro/getting-started/dependencies.html.md +++ b/website/source/intro/getting-started/dependencies.html.md @@ -39,7 +39,7 @@ This should look familiar from the earlier example of adding an EC2 instance resource, except this time we're building an "aws\_eip" resource type. This resource type allocates and associates an -[elastic IP](http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html) +[elastic IP](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/elastic-ip-addresses-eip.html) to an EC2 instance. The only parameter for diff --git a/website/source/intro/getting-started/install.html.markdown b/website/source/intro/getting-started/install.html.markdown index 3a171352a..fb0c2879f 100644 --- a/website/source/intro/getting-started/install.html.markdown +++ b/website/source/intro/getting-started/install.html.markdown @@ -23,9 +23,9 @@ Terraform will be installed. The directory will contain a set of binary programs, such as `terraform`, `terraform-provider-aws`, etc. The final step is to make sure the directory you installed Terraform to is on the PATH. See -[this page](http://stackoverflow.com/questions/14637979/how-to-permanently-set-path-on-linux) +[this page](https://stackoverflow.com/questions/14637979/how-to-permanently-set-path-on-linux) for instructions on setting the PATH on Linux and Mac. -[This page](http://stackoverflow.com/questions/1618280/where-can-i-set-path-to-make-exe-on-windows) +[This page](https://stackoverflow.com/questions/1618280/where-can-i-set-path-to-make-exe-on-windows) contains instructions for setting the PATH on Windows. Example for Linux/Mac - Type the following into your terminal: diff --git a/website/source/intro/getting-started/modules.html.md b/website/source/intro/getting-started/modules.html.md index 79c28aa39..d25ef54cc 100644 --- a/website/source/intro/getting-started/modules.html.md +++ b/website/source/intro/getting-started/modules.html.md @@ -22,7 +22,7 @@ Writing modules is covered in more detail in the [modules documentation](/docs/modules/index.html). ~> **Warning!** The examples on this page are _**not** eligible_ for the AWS -[free-tier](http://aws.amazon.com/free/). Do not execute the examples on this +[free-tier](https://aws.amazon.com/free/). Do not execute the examples on this page unless you're willing to spend a small amount of money. ## Using Modules diff --git a/website/source/intro/hashicorp-ecosystem.html.markdown b/website/source/intro/hashicorp-ecosystem.html.markdown index 4e3e8e873..6dfbed626 100644 --- a/website/source/intro/hashicorp-ecosystem.html.markdown +++ b/website/source/intro/hashicorp-ecosystem.html.markdown @@ -12,19 +12,19 @@ HashiCorp is the creator of the open source projects Vagrant, Packer, Terraform, If you are using Terraform to create, combine, and modify infrastructure, it’s likely that you are using base images to configure that infrastructure. Packer is our tool for building those base images, such as AMIs, OpenStack images, Docker containers, and more. -Below are summaries of HashiCorp’s open source projects and a graphic showing how Atlas connects them to create a full application delivery workflow. +Below are summaries of HashiCorp’s open source projects and a graphic showing how Atlas connects them to create a full application delivery workflow. # HashiCorp Ecosystem ![Atlas Workflow](docs/atlas-workflow.png) [Atlas](https://atlas.hashicorp.com/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is HashiCorp's only commercial product. It unites Packer, Terraform, and Consul to make application delivery a versioned, auditable, repeatable, and collaborative process. -[Packer](https://packer.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating machine images and deployable artifacts such as AMIs, OpenStack images, Docker containers, etc. +[Packer](https://www.packer.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating machine images and deployable artifacts such as AMIs, OpenStack images, Docker containers, etc. -[Terraform](https://terraform.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating, combining, and modifying infrastructure. In the Atlas workflow Terraform reads from the artifact registry and provisions infrastructure. +[Terraform](https://www.terraform.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for creating, combining, and modifying infrastructure. In the Atlas workflow Terraform reads from the artifact registry and provisions infrastructure. -[Consul](https://consul.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for service discovery, service registry, and health checks. In the Atlas workflow Consul is configured at the Packer build stage and identifies the service(s) contained in each artifact. Since Consul is configured at the build phase with Packer, when the artifact is deployed with Terraform, it is fully configured with dependencies and service discovery pre-baked. This greatly reduces the risk of an unhealthy node in production due to configuration failure at runtime. +[Consul](https://www.consul.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for service discovery, service registry, and health checks. In the Atlas workflow Consul is configured at the Packer build stage and identifies the service(s) contained in each artifact. Since Consul is configured at the build phase with Packer, when the artifact is deployed with Terraform, it is fully configured with dependencies and service discovery pre-baked. This greatly reduces the risk of an unhealthy node in production due to configuration failure at runtime. -[Serf](https://serfdom.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for cluster membership and failure detection. Consul uses Serf’s gossip protocol as the foundation for service discovery. +[Serf](https://www.serfdom.io/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for cluster membership and failure detection. Consul uses Serf’s gossip protocol as the foundation for service discovery. [Vagrant](https://www.vagrantup.com/?utm_source=terraform&utm_campaign=HashicorpEcosystem) is a HashiCorp tool for managing development environments that mirror production. Vagrant environments reduce the friction of developing a project and reduce the risk of unexpected behavior appearing after deployment. Vagrant boxes can be built in parallel with production artifacts with Packer to maintain parity between development and production. diff --git a/website/source/intro/use-cases.html.markdown b/website/source/intro/use-cases.html.markdown index 794d3cb12..41357e7b0 100644 --- a/website/source/intro/use-cases.html.markdown +++ b/website/source/intro/use-cases.html.markdown @@ -89,7 +89,7 @@ implementations have a control layer and infrastructure layer. Terraform can be used to codify the configuration for software defined networks. This configuration can then be used by Terraform to automatically setup and modify settings by interfacing with the control layer. This allows configuration to be -versioned and changes to be automated. As an example, [AWS VPC](http://aws.amazon.com/vpc/) +versioned and changes to be automated. As an example, [AWS VPC](https://aws.amazon.com/vpc/) is one of the most commonly used SDN implementations, and [can be configured by Terraform](/docs/providers/aws/r/vpc.html). diff --git a/website/source/layouts/_header.erb b/website/source/layouts/_header.erb index 1dcb8234f..f6a353353 100644 --- a/website/source/layouts/_header.erb +++ b/website/source/layouts/_header.erb @@ -5,7 +5,7 @@
- by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>HashiCorp + by<%= partial "layouts/svg/svg-by-hashicorp" %><%= partial "layouts/svg/svg-hashicorp-logo" %>HashiCorp