Release v1.23.0

.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

.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/*"

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:

README.md

@@ -1,7 +1,7 @@
 <!-- markdownlint-disable-file MD013 MD033 MD041 -->
 <div>
-<a href="https://www.juniper.net"><img src="https://www.juniper.net/assets/img/products/junos-os.png" alt="Junos logo" title="Junos" align="right" height="50" /></a>
-<a href="https://www.terraform.io"><img src="https://cdn.rawgit.com/hashicorp/terraform-website/master/content/source/assets/images/product-icons/terraform-icon-color.svg" alt="Terraform logo" title="Terraform" align="right" height="50" /></a>
+<a href="https://www.juniper.net"><img src=".github/junos-os.png" alt="Junos logo" title="Junos" align="right" height="50" /></a>
+<a href="https://www.terraform.io"><img src=".github/terraform.png" alt="Terraform logo" title="Terraform" align="right" height="50" /></a>
 </div>
 
 # 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

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