diff --git a/.github/junos-os.png b/.github/junos-os.png new file mode 100644 index 00000000..a198414d Binary files /dev/null and b/.github/junos-os.png differ diff --git a/.github/terraform.png b/.github/terraform.png new file mode 100644 index 00000000..55640b2b Binary files /dev/null and b/.github/terraform.png differ diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 6bb9f5b0..7e1e9cba 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -34,13 +34,3 @@ jobs: if [[ $(grep -r "^ \{3,\}\(\*\|-\) " website/docs/* | wc -l) -gt 0 ]] ; then \ echo "Too many level of arugments in docs" ; grep -nr "^ \{3,\}\(\*\|-\)" website/docs/* ; exit 1 ; \ fi - - name: Check link for pages in sidebar - run: | - cd website/docs - missing="" - for i in $(find . -type f | sed 's/^.//' | sed 's/.markdown$//') ; do \ - grep -q $i ../junos.erb || missing+="Missing link to $i in website sidebar\n" ; \ - done - if [[ ${missing} != "" ]] ; then \ - echo -e "${missing}" ; exit 1 ; \ - fi \ No newline at end of file diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml index 1aa1c63c..82b5a64f 100644 --- a/.github/workflows/releases.yml +++ b/.github/workflows/releases.yml @@ -124,47 +124,3 @@ jobs: asset_path: ./${{ env.REPO_NAME }}_${{ env.RELEASE_VERSION }}_SHA256SUMS asset_name: ${{ env.REPO_NAME }}_${{ env.RELEASE_VERSION }}_SHA256SUMS asset_content_type: application/octet-stream - website: - name: Deploy Website - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Clone original Terraform Website - run: git clone https://github.com/hashicorp/terraform-website.git /tmp/terraform-website - - name: Copy necessary files and co - working-directory: ./.terraform-website/ - run: | - cp /tmp/terraform-website/content/config.rb . - cp /tmp/terraform-website/content/Gemfile . - cp /tmp/terraform-website/content/Gemfile.lock . - cp /tmp/terraform-website/content/middleman_helpers.rb . - cp -r /tmp/terraform-website/content/source/assets ./source/ - cp /tmp/terraform-website/content/source/layouts/inner.erb ./source/layouts/ - echo "redirect 'index.html', to: 'docs/providers/junos/index.html'" >> config.rb - - name: Setup ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: "2.7" - - name: Install middleman - working-directory: ./.terraform-website/ - run: | - gem install bundler bundler:1.17.3 - # json fail with (1.8.3.1) in Gemfile.lock - bundle update json --jobs 4 --retry 3 - bundle install --jobs 4 --retry 3 - - name: Build Website - working-directory: ./.terraform-website/ - run: bundle exec middleman build --verbose - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-west-1 - - name: Download google files from S3 - run: aws s3 cp s3://terraform-provider-junos.jeremm.fr/google72955f25e01c2a06.html .terraform-website/build/ - - name: Upload Website on S3 - run: aws s3 sync .terraform-website/build/ s3://terraform-provider-junos.jeremm.fr/ --delete - - name: Invalidate Cloudfront Distribution - run: aws cloudfront create-invalidation --distribution-id ${{ secrets.DISTRIBUTION_ID }} --paths "/docs/*" \ No newline at end of file diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml deleted file mode 100644 index a0c19446..00000000 --- a/.github/workflows/website.yml +++ /dev/null @@ -1,52 +0,0 @@ -name: Website -on: - push: - branches: - - main -jobs: - deploy: - name: Update Website - runs-on: ubuntu-latest - if: | - startsWith(github.event.head_commit.message, '[website]') - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Clone original Terraform Website - run: git clone https://github.com/hashicorp/terraform-website.git /tmp/terraform-website - - name: Copy necessary files and co - working-directory: ./.terraform-website/ - run: | - cp /tmp/terraform-website/content/config.rb . - cp /tmp/terraform-website/content/Gemfile . - cp /tmp/terraform-website/content/Gemfile.lock . - cp /tmp/terraform-website/content/middleman_helpers.rb . - cp -r /tmp/terraform-website/content/source/assets ./source/ - cp /tmp/terraform-website/content/source/layouts/inner.erb ./source/layouts/ - echo "redirect 'index.html', to: 'docs/providers/junos/index.html'" >> config.rb - - name: Setup ruby - uses: ruby/setup-ruby@v1 - with: - ruby-version: "2.7" - - name: Install middleman - working-directory: ./.terraform-website/ - run: | - gem install bundler bundler:1.17.3 - # json fail with (1.8.3.1) in Gemfile.lock - bundle update json --jobs 4 --retry 3 - bundle install --jobs 4 --retry 3 - - name: Build Website - working-directory: ./.terraform-website/ - run: bundle exec middleman build --verbose - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 - with: - aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - aws-region: us-west-1 - - name: Download google files from S3 - run: aws s3 cp s3://terraform-provider-junos.jeremm.fr/google72955f25e01c2a06.html .terraform-website/build/ - - name: Upload Website on S3 - run: aws s3 sync .terraform-website/build/ s3://terraform-provider-junos.jeremm.fr/ --delete - - name: Invalidate Cloudfront Distribution - run: aws cloudfront create-invalidation --distribution-id ${{ secrets.DISTRIBUTION_ID }} --paths "/docs/*" diff --git a/.terraform-website/source/docs/providers/junos b/.terraform-website/source/docs/providers/junos deleted file mode 120000 index 94035d12..00000000 --- a/.terraform-website/source/docs/providers/junos +++ /dev/null @@ -1 +0,0 @@ -../../../../website/docs \ No newline at end of file diff --git a/.terraform-website/source/layouts/junos.erb b/.terraform-website/source/layouts/junos.erb deleted file mode 120000 index 57db2e71..00000000 --- a/.terraform-website/source/layouts/junos.erb +++ /dev/null @@ -1 +0,0 @@ -../../../website/junos.erb \ No newline at end of file diff --git a/.terraform-website/source/layouts/layout.erb b/.terraform-website/source/layouts/layout.erb deleted file mode 100644 index 337a9f55..00000000 --- a/.terraform-website/source/layouts/layout.erb +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - <%= title_for(current_page) %> - - - - <%= stylesheet_link_tag "application" %> - - - - <%= javascript_include_tag "application", defer: true %> - <%= javascript_include_tag "terraform-overview/home-hero", defer: true %> - - <%= yield_content :head %> - - - - - <%= yield %> - - - diff --git a/CHANGELOG.md b/CHANGELOG.md index 8fdbed0e..21ee6c29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,13 @@ ENHANCEMENTS: BUG FIXES: +## 1.23.0 (December 17, 2021) + +ENHANCEMENTS: + +* resource/`junos_security_address_book`: `network_address`, `wildcard_address`, `dns_name`, `range_address` and `address_set` block arguments are now unordered blocks. (Fixes [#316](https://github.com/jeremmfr/terraform-provider-junos/issues/316)) +* resource/`junos_security_zone`: `address_book`, `address_book_dns`, `address_book_range`, `address_book_set` and `address_book_wildcard` block arguments are now unordered blocks. (Fixes [#169](https://github.com/jeremmfr/terraform-provider-junos/issues/169)) + ## 1.22.2 (December 07, 2021) BUG FIXES: diff --git a/README.md b/README.md index f8a46b38..9556e252 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@
-Junos logo -Terraform logo +Junos logo +Terraform logo
# terraform-provider-junos @@ -10,7 +10,6 @@ [![Release](https://img.shields.io/github/v/release/jeremmfr/terraform-provider-junos)](https://github.com/jeremmfr/terraform-provider-junos/releases) [![Installs](https://img.shields.io/badge/dynamic/json?logo=terraform&label=installs&query=$.data.attributes.downloads&url=https%3A%2F%2Fregistry.terraform.io%2Fv2%2Fproviders%2F713)](https://registry.terraform.io/providers/jeremmfr/junos) [![Registry](https://img.shields.io/badge/registry-doc%40latest-lightgrey?logo=terraform)](https://registry.terraform.io/providers/jeremmfr/junos/latest/docs) -[![Website](https://img.shields.io/badge/website-doc%40latest-lightgrey)](https://terraform-provider-junos.jeremm.fr/) [![License](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/jeremmfr/terraform-provider-junos/blob/main/LICENSE) [![Go Status](https://github.com/jeremmfr/terraform-provider-junos/actions/workflows/go.yml/badge.svg)](https://github.com/jeremmfr/terraform-provider-junos/actions/workflows/go.yml) [![Linters Status](https://github.com/jeremmfr/terraform-provider-junos/actions/workflows/linters.yml/badge.svg)](https://github.com/jeremmfr/terraform-provider-junos/actions/workflows/linters.yml) @@ -22,8 +21,7 @@ This is an **unofficial** Terraform provider for Junos devices with netconf protocol -See [website](https://terraform-provider-junos.jeremm.fr/) or -[Terraform registry](https://registry.terraform.io/providers/jeremmfr/junos) +See [Terraform registry](https://registry.terraform.io/providers/jeremmfr/junos) for provider and resources documentation. ## Requirements diff --git a/go.mod b/go.mod index 06961ce3..454c31ea 100644 --- a/go.mod +++ b/go.mod @@ -4,11 +4,11 @@ go 1.16 require ( github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 - github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0 + github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.0 github.com/jeremmfr/go-netconf v0.4.1 github.com/jeremmfr/go-utils v0.3.0 github.com/jeremmfr/junosdecode v1.1.0 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 ) -replace github.com/hashicorp/terraform-plugin-sdk/v2 v2.8.0 => github.com/jeremmfr/terraform-plugin-sdk/v2 v2.8.1-0.20211007115003-2ac7d96a040a +replace github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/jeremmfr/terraform-plugin-sdk/v2 v2.10.1-0.20211216113247-43f5422548b6 diff --git a/go.sum b/go.sum index cabe173a..ffa0cc6d 100644 --- a/go.sum +++ b/go.sum @@ -134,12 +134,10 @@ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0 h1:pMen7vLs8nvgEYhywH3KDWJIJTeEr2ULsVWHWYHQyBs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -158,6 +156,7 @@ github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv github.com/hashicorp/go-checkpoint v0.5.0 h1:MFYpPZCnQqQTE18jFwSII6eUQrD/oxMFp3mlgcqk5mU= github.com/hashicorp/go-checkpoint v0.5.0/go.mod h1:7nfLNL10NsxqO4iWuW6tWW0HjZuDrwkBuEQsVcpCOgg= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ= github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 h1:1/D3zfFHttUKaCaGKZ/dR2roBXv0vKbSCnssIldfQdI= @@ -166,33 +165,43 @@ github.com/hashicorp/go-getter v1.5.3 h1:NF5+zOlQegim+w/EUhSLh6QhXHmZMEeHLQzllkQ github.com/hashicorp/go-getter v1.5.3/go.mod h1:BrrV/1clo8cCYu6mxvboYg+KutTiFnXjMEgDD8+i7ZI= github.com/hashicorp/go-hclog v0.0.0-20180709165350-ff2cf002a8dd/go.mod h1:9bjs9uLqI8l75knNv3lV1kA55veR+WUPSiKIWcQHudI= github.com/hashicorp/go-hclog v0.14.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v0.15.0 h1:qMuK0wxsoW4D0ddCCYwPSTm4KQv1X1ke3WmPWZ0Mvsk= -github.com/hashicorp/go-hclog v0.15.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o= +github.com/hashicorp/go-hclog v0.16.1 h1:IVQwpTGNRRIHafnTs2dQLIk4ENtneRIEEJWOVDqz99o= +github.com/hashicorp/go-hclog v0.16.1/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= +github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-plugin v1.3.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0= github.com/hashicorp/go-plugin v1.4.1 h1:6UltRQlLN9iZO513VveELp5xyaFxVD2+1OVylE+2E+w= github.com/hashicorp/go-plugin v1.4.1/go.mod h1:5fGEH17QVwTTcR0zV7yhDPLLmFX9YSZ38b18Udy6vYQ= github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo= github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= +github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-version v1.1.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hc-install v0.3.1 h1:VIjllE6KyAI1A244G8kTaHXy+TL5/XYzvrtFi8po/Yk= +github.com/hashicorp/hc-install v0.3.1/go.mod h1:3LCdWcCDS1gaHC9mhHCGbkYfoY6vdsKohGjugbZdZak= github.com/hashicorp/hcl/v2 v2.3.0 h1:iRly8YaMwTBAKhn1Ybk7VSdzbnopghktCD031P8ggUE= github.com/hashicorp/hcl/v2 v2.3.0/go.mod h1:d+FwDBbOLvpAM3Z6J7gPj/VoAGkNe/gm352ZhjJ/Zv8= github.com/hashicorp/logutils v1.0.0 h1:dLEQVugN8vlakKOUE3ihGLTZJRB4j+M2cdTm/ORI65Y= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/terraform-exec v0.14.0 h1:UQoUcxKTZZXhyyK68Cwn4mApT4mnFPmEXPiqaHL9r+w= -github.com/hashicorp/terraform-exec v0.14.0/go.mod h1:qrAASDq28KZiMPDnQ02sFS9udcqEkRly002EA2izXTA= -github.com/hashicorp/terraform-json v0.12.0 h1:8czPgEEWWPROStjkWPUnTQDXmpmZPlkQAwYYLETaTvw= -github.com/hashicorp/terraform-json v0.12.0/go.mod h1:pmbq9o4EuL43db5+0ogX10Yofv1nozM+wskr/bGFJpI= -github.com/hashicorp/terraform-plugin-go v0.4.0 h1:LFbXNeLDo0J/wR0kUzSPq0RpdmFh2gNedzU0n/gzPAo= -github.com/hashicorp/terraform-plugin-go v0.4.0/go.mod h1:7u/6nt6vaiwcWE2GuJKbJwNlDFnf5n95xKw4hqIVr58= +github.com/hashicorp/terraform-exec v0.15.0 h1:cqjh4d8HYNQrDoEmlSGelHmg2DYDh5yayckvJ5bV18E= +github.com/hashicorp/terraform-exec v0.15.0/go.mod h1:H4IG8ZxanU+NW0ZpDRNsvh9f0ul7C0nHP+rUR/CHs7I= +github.com/hashicorp/terraform-json v0.13.0 h1:Li9L+lKD1FO5RVFRM1mMMIBDoUHslOniyEi5CM+FWGY= +github.com/hashicorp/terraform-json v0.13.0/go.mod h1:y5OdLBCT+rxbwnpxZs9kGL7R9ExU76+cpdY8zHwoazk= +github.com/hashicorp/terraform-plugin-go v0.5.0 h1:+gCDdF0hcYCm0YBTxrP4+K1NGIS5ZKZBKDORBewLJmg= +github.com/hashicorp/terraform-plugin-go v0.5.0/go.mod h1:PAVN26PNGpkkmsvva1qfriae5Arky3xl3NfzKa8XFVM= +github.com/hashicorp/terraform-plugin-log v0.2.0 h1:rjflRuBqCnSk3UHOR25MP1G5BDLKktTA6lNjjcAnBfI= +github.com/hashicorp/terraform-plugin-log v0.2.0/go.mod h1:E1kJmapEHzqu1x6M++gjvhzM2yMQNXPVWZRCB8sgYjg= +github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 h1:1FGtlkJw87UsTMg5s8jrekrHmUPUJaMcu6ELiVhQrNw= +github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896/go.mod h1:bzBPnUIkI0RxauU8Dqo+2KrZZ28Cf48s8V6IHt3p4co= +github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 h1:HKLsbzeOsfXmKNpr3GiT18XAblV0BjCbzL8KQAMZGa0= +github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg= github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ= github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= @@ -209,8 +218,8 @@ github.com/jeremmfr/go-utils v0.3.0 h1:f69G5Z6EnHO2bNEW+aeWB22P/4/plS1DZ2UZK7gd+ github.com/jeremmfr/go-utils v0.3.0/go.mod h1:K0lGadiSvg9OKGJnW4Bs3t18/VApp/6x2+BV93Sts2M= github.com/jeremmfr/junosdecode v1.1.0 h1:Os8QeOzyL+BPuDZJMjyJgz4QPOgA8EChgKB2Ih5wwCc= github.com/jeremmfr/junosdecode v1.1.0/go.mod h1:nTY0XbZC2ePbZdV0wuUboSMtGrJxtpwWVYfHjrS2Oqw= -github.com/jeremmfr/terraform-plugin-sdk/v2 v2.8.1-0.20211007115003-2ac7d96a040a h1:7FBrhGngiR+2C7zs74UtCgXpzWJKX04mJN7Ry3kTxWU= -github.com/jeremmfr/terraform-plugin-sdk/v2 v2.8.1-0.20211007115003-2ac7d96a040a/go.mod h1:6KbP09YzlB++S6XSUKYl83WyoHVN4MgeoCbPRsdfCtA= +github.com/jeremmfr/terraform-plugin-sdk/v2 v2.10.1-0.20211216113247-43f5422548b6 h1:W8cfy+Q4a+wWsAfllNUq2B9w9V+1o2mYcc1sMZ1rtS0= +github.com/jeremmfr/terraform-plugin-sdk/v2 v2.10.1-0.20211216113247-43f5422548b6/go.mod h1:FjM9DXWfP0w/AeOtJoSKHBZ01LqmaO6uP4bXhv3fekw= github.com/jessevdk/go-flags v1.5.0/go.mod h1:Fw0T6WPc1dYxT4mKEZRfG5kJhaTDP9pj1c2EWnYs/m4= github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE= github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74= @@ -255,8 +264,8 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-testing-interface v0.0.0-20171004221916-a61a99592b77/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= -github.com/mitchellh/go-testing-interface v1.0.4 h1:ZU1VNC02qyufSZsjjs7+khruk2fKvbQ3TwRV/IBCeFA= -github.com/mitchellh/go-testing-interface v1.0.4/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= +github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= github.com/mitchellh/go-wordwrap v1.0.0 h1:6GlHJ/LTGMrIJbwgdqdl2eEH8o+Exx/0m8ir9Gns0u4= github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo= @@ -304,10 +313,10 @@ github.com/xanzy/ssh-agent v0.3.0/go.mod h1:3s9xbODqPuuhK9JV1R321M/FlMZSBvE5aY6e github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s= github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.2.1/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8= -github.com/zclconf/go-cty v1.8.4 h1:pwhhz5P+Fjxse7S7UriBrMu6AUJSZM5pKqGem1PjGAs= -github.com/zclconf/go-cty v1.8.4/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= +github.com/zclconf/go-cty v1.9.1 h1:viqrgQwFl5UpSxc046qblj78wZXVDFnSOufaOTER+cc= +github.com/zclconf/go-cty v1.9.1/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk= github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b/go.mod h1:ZRKQfBXbGkpdV6QMzT3rU1kSTAnfu1dO8dPKjYprgj8= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -325,6 +334,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -373,6 +383,7 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191009170851-d66e71096ffb/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -386,6 +397,7 @@ golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210326060303-6b1517762897 h1:KrsHThm5nFk34YtATK1LsThyGhGbGe1olrte/HInHvs= golang.org/x/net v0.0.0-20210326060303-6b1517762897/go.mod h1:uSPa2vr4CLtc/ILN5odXGNXS6mhrKVzTaCXzk9m6W3k= diff --git a/junos/resource_security_address_book.go b/junos/resource_security_address_book.go index 045f6183..7e159fb8 100644 --- a/junos/resource_security_address_book.go +++ b/junos/resource_security_address_book.go @@ -48,7 +48,7 @@ func resourceSecurityAddressBook() *schema.Resource { Elem: &schema.Schema{Type: schema.TypeString}, }, "network_address": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -65,12 +65,13 @@ func resourceSecurityAddressBook() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, }, "wildcard_address": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -87,12 +88,13 @@ func resourceSecurityAddressBook() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, }, "dns_name": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -108,12 +110,13 @@ func resourceSecurityAddressBook() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, }, "range_address": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -135,12 +138,13 @@ func resourceSecurityAddressBook() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, }, "address_set": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -162,6 +166,7 @@ func resourceSecurityAddressBook() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, @@ -372,7 +377,7 @@ func setSecurityAddressBook(d *schema.ResourceData, m interface{}, jnprSess *Net configSet = append(configSet, setPrefix+" attach zone "+attachZone) } addressNameList := make([]string, 0) - for _, v := range d.Get("network_address").([]interface{}) { + for _, v := range d.Get("network_address").(*schema.Set).List() { address := v.(map[string]interface{}) if bchk.StringInSlice(address["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", address["name"].(string)) @@ -384,7 +389,7 @@ func setSecurityAddressBook(d *schema.ResourceData, m interface{}, jnprSess *Net configSet = append(configSet, setPrefixAddr+"description \""+address["description"].(string)+"\"") } } - for _, v := range d.Get("wildcard_address").([]interface{}) { + for _, v := range d.Get("wildcard_address").(*schema.Set).List() { address := v.(map[string]interface{}) if bchk.StringInSlice(address["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", address["name"].(string)) @@ -396,7 +401,7 @@ func setSecurityAddressBook(d *schema.ResourceData, m interface{}, jnprSess *Net configSet = append(configSet, setPrefixAddr+"description \""+address["description"].(string)+"\"") } } - for _, v := range d.Get("dns_name").([]interface{}) { + for _, v := range d.Get("dns_name").(*schema.Set).List() { address := v.(map[string]interface{}) if bchk.StringInSlice(address["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", address["name"].(string)) @@ -408,7 +413,7 @@ func setSecurityAddressBook(d *schema.ResourceData, m interface{}, jnprSess *Net configSet = append(configSet, setPrefixAddr+"description \""+address["description"].(string)+"\"") } } - for _, v := range d.Get("range_address").([]interface{}) { + for _, v := range d.Get("range_address").(*schema.Set).List() { address := v.(map[string]interface{}) if bchk.StringInSlice(address["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", address["name"].(string)) @@ -420,7 +425,7 @@ func setSecurityAddressBook(d *schema.ResourceData, m interface{}, jnprSess *Net configSet = append(configSet, setPrefixAddr+"description \""+address["description"].(string)+"\"") } } - for _, v := range d.Get("address_set").([]interface{}) { + for _, v := range d.Get("address_set").(*schema.Set).List() { addressSet := v.(map[string]interface{}) if bchk.StringInSlice(addressSet["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses or address-sets with the same name %s", addressSet["name"].(string)) diff --git a/junos/resource_security_zone.go b/junos/resource_security_zone.go index 8b68535f..eac7d0a7 100644 --- a/junos/resource_security_zone.go +++ b/junos/resource_security_zone.go @@ -47,7 +47,7 @@ func resourceSecurityZone() *schema.Resource { ValidateDiagFunc: validateNameObjectJunos([]string{}, 64, formatDefault), }, "address_book": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -64,6 +64,7 @@ func resourceSecurityZone() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, @@ -80,7 +81,7 @@ func resourceSecurityZone() *schema.Resource { }, }, "address_book_dns": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -96,20 +97,23 @@ func resourceSecurityZone() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, "ipv4_only": { Type: schema.TypeBool, Optional: true, + Default: false, }, "ipv6_only": { Type: schema.TypeBool, Optional: true, + Default: false, }, }, }, }, "address_book_range": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -131,12 +135,13 @@ func resourceSecurityZone() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, }, "address_book_set": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -158,12 +163,13 @@ func resourceSecurityZone() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, }, "address_book_wildcard": { - Type: schema.TypeList, + Type: schema.TypeSet, Optional: true, Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ @@ -180,6 +186,7 @@ func resourceSecurityZone() *schema.Resource { "description": { Type: schema.TypeString, Optional: true, + Default: "", }, }, }, @@ -439,7 +446,7 @@ func setSecurityZone(d *schema.ResourceData, m interface{}, jnprSess *NetconfObj configSet = append(configSet, setPrefix) if !d.Get("address_book_configure_singly").(bool) { addressNameList := make([]string, 0) - for _, v := range d.Get("address_book").([]interface{}) { + for _, v := range d.Get("address_book").(*schema.Set).List() { addressBook := v.(map[string]interface{}) if bchk.StringInSlice(addressBook["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", addressBook["name"].(string)) @@ -452,7 +459,7 @@ func setSecurityZone(d *schema.ResourceData, m interface{}, jnprSess *NetconfObj addressBook["name"].(string)+" description \""+v2+"\"") } } - for _, v := range d.Get("address_book_dns").([]interface{}) { + for _, v := range d.Get("address_book_dns").(*schema.Set).List() { addressBook := v.(map[string]interface{}) if bchk.StringInSlice(addressBook["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", addressBook["name"].(string)) @@ -472,7 +479,7 @@ func setSecurityZone(d *schema.ResourceData, m interface{}, jnprSess *NetconfObj addressBook["name"].(string)+" description \""+v2+"\"") } } - for _, v := range d.Get("address_book_range").([]interface{}) { + for _, v := range d.Get("address_book_range").(*schema.Set).List() { addressBook := v.(map[string]interface{}) if bchk.StringInSlice(addressBook["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", addressBook["name"].(string)) @@ -486,7 +493,7 @@ func setSecurityZone(d *schema.ResourceData, m interface{}, jnprSess *NetconfObj addressBook["name"].(string)+" description \""+v2+"\"") } } - for _, v := range d.Get("address_book_wildcard").([]interface{}) { + for _, v := range d.Get("address_book_wildcard").(*schema.Set).List() { addressBook := v.(map[string]interface{}) if bchk.StringInSlice(addressBook["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses with the same name %s", addressBook["name"].(string)) @@ -499,7 +506,7 @@ func setSecurityZone(d *schema.ResourceData, m interface{}, jnprSess *NetconfObj addressBook["name"].(string)+" description \""+v2+"\"") } } - for _, v := range d.Get("address_book_set").([]interface{}) { + for _, v := range d.Get("address_book_set").(*schema.Set).List() { addressBookSet := v.(map[string]interface{}) if bchk.StringInSlice(addressBookSet["name"].(string), addressNameList) { return fmt.Errorf("multiple addresses or address-sets with the same name %s", addressBookSet["name"].(string)) diff --git a/website/docs/d/interfaces_physical_present.html.markdown b/website/docs/d/interfaces_physical_present.html.markdown index 9fd9b0af..07da0dbe 100644 --- a/website/docs/d/interfaces_physical_present.html.markdown +++ b/website/docs/d/interfaces_physical_present.html.markdown @@ -40,7 +40,7 @@ The following attributes are exported: An identifier for the resource. - **interface_names** (List of String) List of interface names found. -- **interface_statuses** (List of Block) +- **interface_statuses** (Block List) For each interface name. - **name** (String) Interface name. diff --git a/website/docs/r/access_address_assignment_pool.html.markdown b/website/docs/r/access_address_assignment_pool.html.markdown index 6447da27..210da6a7 100644 --- a/website/docs/r/access_address_assignment_pool.html.markdown +++ b/website/docs/r/access_address_assignment_pool.html.markdown @@ -58,7 +58,7 @@ The following arguments are supported: - **excluded_address** (Optional, Set of String) Excluded Addresses. Need to be valid IP addresses. -- **excluded_range** (Optional, List of Block) +- **excluded_range** (Optional, Block List) For each name of excluded address range to declare. - **name** (Required, String) Range name. @@ -68,7 +68,7 @@ The following arguments are supported: - **high** (Required, String) Upper limit of excluded address range. Need to be a valid IP address. -- **host** (Optional, List of Block) +- **host** (Optional, Block List) For each name of host to declare. `type` need to be `inet`. - **name** (Required, String) @@ -79,7 +79,7 @@ The following arguments are supported: - **Reserved address** (Required, String) Hardware address. Need to be a valid IPv4 address. -- **inet_range** (Optional, List of Block) +- **inet_range** (Optional, Block List) For each name of address range to declare. `type` need to be `inet`. - **name** (Required, String) @@ -90,7 +90,7 @@ The following arguments are supported: - **high** (Required, String) Upper limit of address range. Need to be a valid IPv4 address. -- **inet6_range** (Optional, List of Block) +- **inet6_range** (Optional, Block List) For each name of address range to declare. Need to set one of `prefix_length` or `low` + `high`. `type` need to be `inet6`. @@ -159,13 +159,13 @@ The following arguments are supported: DHCP option. Format need to match `^\d+ (array )?(byte|flag|hex-string|integer|ip-address|short|string|unsigned-integer|unsigned-short) .*$`. -- **option_match_82_circuit_id** (Optional, List of Block) +- **option_match_82_circuit_id** (Optional, Block List) For each value to declare, circuit ID portion of the option 82. - **value** (Required, String) Match value. - **range** (Required, String) Range name. -- **option_match_82_remote_id** (Optional, List of Block) +- **option_match_82_remote_id** (Optional, Block List) For each value to declare, remote ID portion of the option 82. - **value** (Required, String) Match value. diff --git a/website/docs/r/chassis_cluster.html.markdown b/website/docs/r/chassis_cluster.html.markdown index eedfbb29..176c3053 100644 --- a/website/docs/r/chassis_cluster.html.markdown +++ b/website/docs/r/chassis_cluster.html.markdown @@ -85,7 +85,7 @@ The following arguments are supported: Number of redundant ethernet interfaces (1..128) - **config_sync_no_secondary_bootup_auto** (Optional, Boolean) Disable auto configuration synchronize on secondary bootup. -- **control_ports** (Optional, Set of Block) +- **control_ports** (Optional, Block Set) For each combination of block arguments, enable the specific control port to use as a control link for the chassis cluster. Only available for some higher end Juniper SRX devices. diff --git a/website/docs/r/security_address_book.html.markdown b/website/docs/r/security_address_book.html.markdown index 3c460b80..2e3ee011 100644 --- a/website/docs/r/security_address_book.html.markdown +++ b/website/docs/r/security_address_book.html.markdown @@ -59,7 +59,7 @@ The following arguments are supported: - **attach_zone** (Optional, List of String) List of zones to attach address book to. **NOTE:** Cannot be set on global address book. -- **network_address** (Optional, Block List) +- **network_address** (Optional, Block Set) For each name of network address. - **name** (Required, String) Name of network address. @@ -67,7 +67,7 @@ The following arguments are supported: CIDR value of network address (`192.0.0.0/24`). - **description** (Optional, String) Description of network address. -- **wildcard_address** (Optional, Block List) +- **wildcard_address** (Optional, Block Set) For each name of wildcard address. - **name** (Required, String) Name of wildcard address. @@ -75,7 +75,7 @@ The following arguments are supported: Network and mask of wildcard address (`192.0.0.0/255.255.0.255`). - **description** (Optional, String) Description of network address. -- **dns_name** (Optional, Block List) +- **dns_name** (Optional, Block Set) For each name of dns name address. - **name** (Required, String) Name of dns name address. @@ -83,7 +83,7 @@ The following arguments are supported: DNS name string value (`juniper.net`). - **description** (Optional, String) Description of dns name address. -- **range_address** (Optional, Block List) +- **range_address** (Optional, Block Set) For each name of range address. - **name** (Required, String) Name of range address. @@ -93,7 +93,7 @@ The following arguments are supported: IP address of end of range. - **description** (Optional, String) Description of range address. -- **address_set** (Optional, Block List) +- **address_set** (Optional, Block Set) For each name of address-set to declare. - **name** (Required, String) Name of address-set. diff --git a/website/docs/r/security_zone.html.markdown b/website/docs/r/security_zone.html.markdown index 8cafb9c7..58e41ce7 100644 --- a/website/docs/r/security_zone.html.markdown +++ b/website/docs/r/security_zone.html.markdown @@ -30,7 +30,7 @@ The following arguments are supported: - **name** (Required, String, Forces new resource) The name of security zone. -- **address_book** (Optional, Block List) +- **address_book** (Optional, Block Set) For each name of address to declare. - **name** (Required, String) Name of address. @@ -42,7 +42,7 @@ The following arguments are supported: Disable management of address-book in this resource to be able to manage them with specific resources. Conflict with `address_book_*`. -- **address_book_dns** (Optional, Block List) +- **address_book_dns** (Optional, Block Set) For each name of dns-name address to declare. - **name** (Required, String) Name of address. @@ -54,7 +54,7 @@ The following arguments are supported: IPv4 dns address. - **ipv6_only** (Optional, Boolean) IPv6 dns address. -- **address_book_range** (Optional, Block List) +- **address_book_range** (Optional, Block Set) For each name of range-address to declare. - **name** (Required, String) Name of address. @@ -64,7 +64,7 @@ The following arguments are supported: Upper limit of address range. - **description** (Optional, String) Description of address. -- **address_book_set** (Optional, Block List) +- **address_book_set** (Optional, Block Set) For each name of address-set to declare. - **name** (Required, String) Name of address-set. @@ -74,7 +74,7 @@ The following arguments are supported: List of address-set names. - **description** (Optional, String) Description of address-set. -- **address_book_wildcard** (Optional, Block List) +- **address_book_wildcard** (Optional, Block Set) For each name of wildcard-address to declare. - **name** (Required, String) Name of address. diff --git a/website/docs/r/system_services_dhcp_localserver_group.html.markdown b/website/docs/r/system_services_dhcp_localserver_group.html.markdown index 03229241..bd1dec4f 100644 --- a/website/docs/r/system_services_dhcp_localserver_group.html.markdown +++ b/website/docs/r/system_services_dhcp_localserver_group.html.markdown @@ -109,7 +109,7 @@ The following arguments are supported: Merge or replace the client dynamic profiles. Need to be `merge` or `replace`. `dynamic_profile_aggregate_clients` need to be true. -- **interface** (Optional, Set of Block) +- **interface** (Optional, Block Set) For each name of interface to declare. See [below for nested schema](#interface-arguments). - **lease_time_validation** (Optional, Block) @@ -253,7 +253,7 @@ The following arguments are supported: - **client_discover_match** (Optional, String) Use incoming interface or option 60 and option 82 match criteria for DISCOVER PDU. Need to be `incoming-interface` or `option60-and-option82`. -- **delay_offer_based_on** (Optional, Set of Block) +- **delay_offer_based_on** (Optional, Block Set) For each combination of block arguments, filter options for dhcp-server. - **option** (Required, String) Option. @@ -298,7 +298,7 @@ The following arguments are supported: Use a reduced prefix lease time for the client. In seconds (600..86400 seconds). - **client_negotiation_match_incoming_interface** (Optional, Boolean) Use incoming interface match criteria for SOLICIT PDU -- **delay_advertise_based_on** (Optional, Set of Block) +- **delay_advertise_based_on** (Optional, Block Set) For each combination of block arguments, filter options for dhcp-server. - **option** (Required, String) Option. diff --git a/website/junos.erb b/website/junos.erb deleted file mode 100644 index 9f6ee379..00000000 --- a/website/junos.erb +++ /dev/null @@ -1,329 +0,0 @@ -<% wrap_layout :inner do %> - <% content_for :sidebar do %> - - <% end %> - - <%= yield %> - <% end %>