Merge pull request #5 in TER/terraform-vcloud-linuxvm from ~JFROCHE/terraform-vcloud-linuxvm:feat/upgrade-provider to master

* commit '2fa38b7d1ad45a21c7e35b28524eee9300b4d7bc':
  ci: add linter
  Update changelog
  Bump version: 0.9.0 → 1.0.0
  chore: update readme
  Update changelog
  chore: add helper script to upload releases
  test: use vault to get vcloud credentials
  chore: update pre-commit config & fix lint
  chore: go vendoring
  test: create/test/destroy vm using basic example
  chore: add validation for zone and dc variables
  fix: instance fact is empty by default
  feat: add defaults for storage profile
  feat: set rhel 8 as default template
  feat: breaking change: enable cpu/memory hot add
  Update changelog
  Bump version: 0.8.0 → 0.9.0
  Update changelog
  chore: add helper files to release

Author: ROCHE Jean Francois

.bumpversion.cfg

@@ -0,0 +1,6 @@
+[bumpversion]
+current_version = 1.0.0
+commit = True
+tag = True
+
+[bumpversion:file:version.txt]

.chglog/CHANGELOG.tpl.md

@@ -0,0 +1,56 @@
+{{ if .Versions -}}
+<a name="unreleased"></a>
+## [Unreleased]
+
+{{ if .Unreleased.CommitGroups -}}
+{{ range .Unreleased.CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
+{{ range .Versions }}
+<a name="{{ .Tag.Name }}"></a>
+## {{ if .Tag.Previous }}[{{ .Tag.Name }}]{{ else }}{{ .Tag.Name }}{{ end }} - {{ datetime "2006-01-02" .Tag.Date }}
+{{ range .CommitGroups -}}
+### {{ .Title }}
+{{ range .Commits -}}
+- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
+{{ end }}
+{{ end -}}
+
+{{- if .RevertCommits -}}
+### Reverts
+{{ range .RevertCommits -}}
+- {{ .Revert.Header }}
+{{ end }}
+{{ end -}}
+
+{{- if .MergeCommits -}}
+### Pull Requests
+{{ range .MergeCommits -}}
+- {{ .Header }}
+{{ end }}
+{{ end -}}
+
+{{- if .NoteGroups -}}
+{{ range .NoteGroups -}}
+### {{ .Title }}
+{{ range .Notes }}
+{{ .Body }}
+{{ end }}
+{{ end -}}
+{{ end -}}
+{{ end -}}
+
+{{- if .Versions }}
+[Unreleased]: {{ .Info.RepositoryURL }}/compare/{{ $latest := index .Versions 0 }}{{ $latest.Tag.Name }}...HEAD
+{{ range .Versions -}}
+{{ if .Tag.Previous -}}
+[{{ .Tag.Name }}]: {{ $.Info.RepositoryURL }}/compare/{{ .Tag.Previous.Name }}...{{ .Tag.Name }}
+{{ end -}}
+{{ end -}}
+{{ end -}}

.chglog/config.yml

@@ -0,0 +1,18 @@
+---
+style: github
+template: CHANGELOG.tpl.md
+info:
+  title: CHANGELOG
+  repository_url: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm
+options:
+  commits:
+  commit_groups:
+  header:
+    pattern: "^(\\w*)(?:\\(([\\w\\$\\.\\-\\*\\s]*)\\))?\\:\\s(.*)$"
+    pattern_maps:
+      - Type
+      - Scope
+      - Subject
+  notes:
+    keywords:
+      - BREAKING CHANGE

.envrc

@@ -1,2 +1,4 @@
 source_up
+[[ -f .envrc.local ]] && source ".envrc.local"
+export VAULT_ADDR="https://hashivault.cirb.lan"
 use_nix

.gitignore

@@ -0,0 +1,7 @@
+.terraform
+plan
+.envrc.local
+*.tfstate
+*.tfstate.backup
+*.lock.hcl
+*.bz2

.pre-commit-config.yaml

@@ -1,75 +1,43 @@
 ---
 repos:
-  -
-    repo: 'https://github.com/pre-commit/pre-commit-hooks.git'
-    rev: v2.1.0
+  - repo: 'https://github.com/pre-commit/pre-commit-hooks.git'
+    rev: v3.4.0
     hooks:
-      -
-        id: trailing-whitespace
-        stages:
-          - commit
-          - push
+      - id: trailing-whitespace
         exclude: '^test/vendor/*'
-      -
-        id: check-yaml
-        stages:
-          - commit
-          - push
+      - id: check-yaml
         exclude: '^test/vendor/*'
-      -
-        id: check-json
-        stages:
-          - commit
-          - push
+      - id: check-json
         exclude: '^test/vendor/*'
-      -
-        id: check-merge-conflict
-        stages:
-          - commit
-          - push
-  -
-    repo: 'https://github.com/jumanjihouse/pre-commit-hooks.git'
+      - id: check-merge-conflict
+  - repo: 'https://github.com/jumanjihouse/pre-commit-hooks.git'
     rev: 1.10.2
     hooks:
-      -
-        id: shellcheck
-        stages:
-          - commit
-          - push
-      -
-        id: shfmt
-        stages:
-          - commit
-          - push
-  -
-    repo: 'https://github.com/adrienverge/yamllint'
-    rev: v1.13.0
+      - id: shellcheck
+      - id: shfmt
+  - repo: 'https://github.com/adrienverge/yamllint'
+    rev: v1.26.0
     hooks:
-      -
-        id: yamllint
-        stages:
-          - commit
-          - push
+      - id: yamllint
         exclude: '^test/vendor/*'
-  -
-    repo: 'https://github.com/jorisroovers/gitlint.git'
+  - repo: 'https://github.com/jorisroovers/gitlint.git'
     rev: v0.10.0
     hooks:
-      -
-        id: gitlint
+      - id: gitlint
         stages:
           - commit-msg
-  -
-    repo: 'https://github.com/antonbabenko/pre-commit-terraform'
+  - repo: 'https://github.com/antonbabenko/pre-commit-terraform'
     rev: v1.22.0
     hooks:
       - id: terraform_fmt
       - id: terraform_docs
-  -
-    repo: 'https://github.com/dnephin/pre-commit-golang'
-    rev: HEAD
+  - repo: 'https://github.com/kuleuven/pre-commit-golang.git'
+    rev: 9f264676658ed379d73624df77bde7f501bde89a
     hooks:
-      - id: go-fmt
+      - id: golangci-lint-repo-mod
         exclude: '^test/vendor/*'
-      - id: go-lint
+  - repo: 'https://github.com/Bahjat/pre-commit-golang.git'
+    rev: 85c26d4d1c8a086095a057bbdf8adf56af603ce4
+    hooks:
+      - id: gofumpt
         exclude: '^test/vendor/*'

.yamllint

@@ -0,0 +1,33 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
+  truthy: disable

CHANGELOG.md

@@ -1,40 +1,119 @@
 <a name="unreleased"></a>
 ## [Unreleased]
 
-### Ci
-- fix release
-- generate changelog upon release
 
+<a name="v1.0.0"></a>
+## [v1.0.0] - 2021-03-15
+### Chore
+- update readme
+- add helper script to upload releases
+- update pre-commit config & fix lint
+- go vendoring
+- add validation for zone and dc variables
 
-<a name="v0.2.1"></a>
-## v0.2.1 - 2020-01-16
-### Build
-- update terraform
+### Feat
+- add defaults for storage profile
+- set rhel 8 as default template
+- breaking change: enable cpu/memory hot add
+
+### Fix
+- instance fact is empty by default
+
+### Test
+- use vault to get vcloud credentials
+- create/test/destroy vm using basic example
+
+### BREAKING CHANGE
+
+You will need to upgrade the vcd provider version in
+your code as well. Use `pkgs.unstable.terraform-provider-vcd` instead of
+`pkgs.terraform-provider-vcd` in your `shell.nix'.
+
+
+<a name="v0.9.0"></a>
+## [v0.9.0] - 2021-02-15
+### Chore
+- add helper files to release
+
+### Feat
+- **ansible:** add environment fact in ansible
+
+### Fix
+- missing default puppet directories
+- salt is not always in the template
+
+
+<a name="v0.8"></a>
+## [v0.8] - 2020-11-17
+### Feat
+- Create ip variable to be able to set one to a vm
+
+### Fix
+- lint
+
+
+<a name="v0.7"></a>
+## [v0.7] - 2020-11-10
+
+<a name="v0.6"></a>
+## [v0.6] - 2020-10-19
+### Feat
+- enable user to define extra metadata
+
+
+<a name="v0.5"></a>
+## [v0.5] - 2020-06-05
+
+<a name="v0.4"></a>
+## [v0.4] - 2020-06-05
+
+<a name="v0.3"></a>
+## [v0.3] - 2020-03-16
+### Feat
+- add parameter to power on/off the vm
+
+### Fix
+- ignore changest to the template/catalog
 
-### Ci
-- fix release
-- fix missing git user informations
-- remove local terraform state
-- update terratest
-- remove containers at the end of the tests
-- improve tests & lint
-- ignore vendor
 
-### Doc
-- update input/output documentation
+<a name="v0.2"></a>
+## [v0.2] - 2020-02-25
+### Chore
+- store puppet and ansible facts as ini file
 
 ### Feat
-- add release pipeline
+- add pre_script variable
 
 ### Fix
-- add suffix to user password in vault
+- **fdisk:** do not print anything on stderr while testing
+- **salt:** override the default minion_id
 
 ### Lint
-- drop auto generation of documentation
-- stop using tflint and do not run tests
+- fmt
 
-### Nix
-- use buildGoModule to declare go dependencies
+
+<a name="v0.1"></a>
+## v0.1 - 2020-02-20
+### Feat
+- add ip in output
+- follow cirb hostname naming convention
+- enable usage of an extra disk
+- **customization:** run user post script in postcustomization
+- **metadata:** add dc metadata
+- **storage profile:** add variable to define the storage profile
+
+### Fix
+- missing instance metadata in vcloud metadata
+- **internal-disk:** wait for disk to be created
 
 
-[Unreleased]: https://gitea.icts.kuleuven.be/ceif-lnx/rabbitmq.lnx1/compare/v0.2.1...HEAD
+[Unreleased]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v1.0.0...HEAD
+[v1.0.0]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.9.0...v1.0.0
+[v0.9.0]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.8...v0.9.0
+[v0.8]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.7...v0.8
+[v0.7]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.6...v0.7
+[v0.6]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.5...v0.6
+[v0.5]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.4...v0.5
+[v0.4]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.3...v0.4
+[v0.3]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.2...v0.3
+[v0.2]: http://stash.cirb.lan/projects/CICD/repos/terraform-vcloud-linux-vm/compare/v0.1...v0.2

Jenkinsfile

@@ -0,0 +1,27 @@
+library 'cirb'
+
+pipeline {
+  agent { label 'middleware' }
+
+  options {
+    disableConcurrentBuilds()
+    buildDiscarder(logRotator(numToKeepStr: '10'))
+  }
+
+  stages {
+    stage ('Lint') {
+      steps {
+        checkout scm
+        script {
+          make = new brussels.bric.Make()
+          make.make(target: 'lint', useNixShell: true)
+        }
+      }
+    }
+  }
+  post {
+    cleanup {
+      deleteDir()
+    }
+  }
+}