Merge pull request #157 from jeremmfr/main

Release v1.14.0

.github/workflows/docs.yml

@@ -34,3 +34,13 @@ 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/go.yml

@@ -1,8 +1,8 @@
 name: Go Tests
 on: [push, pull_request]
 jobs:
-  build:
-    name: Build
+  build-1_15:
+    name: Build 1.15
     runs-on: ubuntu-latest
     steps:
       - name: Set up Go 1.15
@@ -15,14 +15,28 @@ jobs:
       - name: Build
         run: go build -v .
 
+  build-1_16:
+    name: Build 1.16
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.16
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.16
+        id: go
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Build
+        run: go build -v .
+
   test:
     name: Test
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.16
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.16
         id: go
       - name: Check out code
         uses: actions/checkout@v2

.github/workflows/golangci-lint-latest.yml

@@ -2,7 +2,7 @@ name: GolangCI-Lint-Latest
 on:
   push:
     branches:
-      - master
+      - main
 jobs:
   run:
     name: Run

.github/workflows/golangci-lint.yml

@@ -10,5 +10,5 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.36
+          version: v1.38
           args: -c .golangci.yml -v

.github/workflows/releases.yml

@@ -37,15 +37,13 @@ jobs:
         goos: [linux, windows, darwin, freebsd]
         goarch: [amd64, arm64]
         exclude:
-          - goos: darwin
-            goarch: arm64
           - goos: windows
             goarch: arm64
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.16
         uses: actions/setup-go@v1
         with:
-          go-version: 1.15
+          go-version: 1.16
         id: go
       - name: Check out code
         uses: actions/checkout@v2
@@ -124,3 +122,57 @@ 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: actions/setup-ruby@v1
+        with:
+          ruby-version: "2.x"
+      - 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: Download google files from S3
+        uses: ItsKarma/[email protected]
+        with:
+          args: s3 cp s3://terraform-provider-junos.jeremm.fr/google72955f25e01c2a06.html .terraform-website/build/
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: Upload Website on S3
+        uses: ItsKarma/[email protected]
+        with:
+          args: s3 sync .terraform-website/build/ s3://terraform-provider-junos.jeremm.fr/ --delete
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+      - name: Invalidate Cloudfront Distribution
+        uses: chetan/[email protected]
+        env:
+          PATHS: '/docs/*'
+          AWS_REGION: 'eu-west-1'
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          DISTRIBUTION: ${{ secrets.DISTRIBUTION_ID }}

.github/workflows/terraform-fmt.yml

@@ -5,10 +5,10 @@ jobs:
     name: terrafmt
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.15
+      - name: Set up Go 1.16
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15
+          go-version: 1.16
         id: go
       - name: Check out code
         uses: actions/checkout@v2

.github/workflows/website.yml

@@ -2,20 +2,14 @@ name: Website
 on:
   push:
     branches:
-      - 'master'
-    paths:
-      - '.github/workflows/website.yml'
-      - '.terraform-website/**'
-      - 'website/**'
-  release:
-    types:
-      - published
-
+      - main
 jobs:
   deploy:
-    name: Deploy Website
+    name: Update Website
     runs-on: ubuntu-latest
-    if: startsWith(github.event.head_commit.message, '[website]')
+    if: |
+      startsWith(github.event.head_commit.message, '[website]') ||
+      (github.event.release.name != '' && github.event.release.draft == false)
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

.golangci.yml

@@ -14,6 +14,8 @@ linters:
     - exhaustivestruct
     - paralleltest
     - gci
+    - cyclop
+    - forcetypeassert
 linters-settings:
   gocyclo:
     # minimal code complexity to report, 30 by default

CHANGELOG.md

@@ -3,6 +3,31 @@ ENHANCEMENTS:
 
 BUG FIXES:
 
+## 1.14.0 (March 19, 2021)
+FEATURES:
+* add `junos_chassis_cluster` resource (Fixes parts of [#106](https://github.com/jeremmfr/terraform-provider-junos/issues/106))
+* add `junos_group_dual_system` resource (Fixes [#120](https://github.com/jeremmfr/terraform-provider-junos/issues/120))
+* add `junos_null_commit_file` resource (Fixes parts of [#136](https://github.com/jeremmfr/terraform-provider-junos/issues/136))
+* add `junos_security_address_book` resource (Fixes [#137](https://github.com/jeremmfr/terraform-provider-junos/issues/137)) Thanks [@tagur87](https://github.com/tagur87)
+* add `junos_security_global_policy` resource (Fixes [#138](https://github.com/jeremmfr/terraform-provider-junos/issues/138))
+* add provider argument `file_permission`
+* add provider argument `fake_create_with_setfile` -  **Don't use in normal terraform run** and **be carefully with this option**
+See docs for more informations (Fixes parts of [#136](https://github.com/jeremmfr/terraform-provider-junos/issues/136))
+
+ENHANCEMENTS:
+* add `cluster`, `family_evpn` arguments in `junos_bgp_group` and `junos_bgp_neighbor` resource
+* add new `bgp_multipath` block argument to replace `multipath` bool argument in `junos_bgp_group` and `junos_bgp_neighbor` resource
+`bgp_multipath` let add optional arguments. `multipath` is now **deprecated**
+* add `esi` argument in `junos_interface_physical` resource and data source (Fixes [#126](https://github.com/jeremmfr/terraform-provider-junos/issues/126)) Thans [@dejongm](https://github.com/dejongm)
+* add `ether_opts`, `gigether_opts` and `parent_ether_opts` arguments in `junos_interface_physical` resource and data source to add more options and replace `ae_lacp`, `ae_link_speed`, `ae_minimum_links`, `ether802_3ad` arguments which are now deprecated (Fixes [#133](https://github.com/jeremmfr/terraform-provider-junos/issues/133), [#127](https://github.com/jeremmfr/terraform-provider-junos/issues/127), parts of [#106](https://github.com/jeremmfr/terraform-provider-junos/issues/106))
+* add `security_inbound_protocols` and `security_inbound_services` arguments in `junos_interface_logical` resource and data source (Fixes [#141](https://github.com/jeremmfr/terraform-provider-junos/issues/141))
+* add `feature_profile_web_filtering_juniper_enhanced_server` argument in `utm` argument of `junos_security` resource (Fixes [#155](https://github.com/jeremmfr/terraform-provider-junos/issues/155))
+
+BUG FIXES:
+* fix change `description` to null in `junos_interface_logical` and `junos_interface_physical` resource
+* fix `prefix` list order issue in `junos_policyoptions_prefix_list` resource (Fixes [#150](https://github.com/jeremmfr/terraform-provider-junos/issues/150))
+* fix validation for `name` of `address_book` and `address_boob_set` in `junos_security_zone` resource (Fixes [#153](https://github.com/jeremmfr/terraform-provider-junos/issues/153))
+
 ## 1.13.1 (February 18, 2021)
 BUG FIXES:
 * fix source nat pool network address not allowed (Fixes [#128](https://github.com/jeremmfr/terraform-provider-junos/issues/128))

README.md

@@ -4,7 +4,7 @@ terraform-provider-junos
 [![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/master/LICENSE)  
+[![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/workflows/Go%20Tests/badge.svg)](https://github.com/jeremmfr/terraform-provider-junos/actions)
 [![Lint Status](https://github.com/jeremmfr/terraform-provider-junos/workflows/GolangCI-Lint/badge.svg)](https://github.com/jeremmfr/terraform-provider-junos/actions)
 [![Go Report Card](https://goreportcard.com/badge/github.com/jeremmfr/terraform-provider-junos)](https://goreportcard.com/report/github.com/jeremmfr/terraform-provider-junos)
@@ -22,7 +22,7 @@ Requirements
 
 Optional
 ---
--	[Go](https://golang.org/doc/install) 1.14 (to build the provider plugin)
+-	[Go](https://golang.org/doc/install) 1.15 (to build the provider plugin)
 
 Automatic install
 ---

go.mod

@@ -1,11 +1,11 @@
 module terraform-provider-junos
 
-go 1.14
+go 1.15
 
 require (
 	github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
-	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.0
+	github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4
 	github.com/jeremmfr/go-netconf v0.3.1
 	github.com/jeremmfr/junosdecode v1.0.0
-	golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897
+	golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
 )