Merge pull request #29 from flexkube/updates

Updates

Author: invidian

.github/workflows/ci.yml

@@ -7,21 +7,21 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: golangci/golangci-lint:v1.40.1
+    container: golangci/golangci-lint:v1.46.0
     steps:
       - uses: actions/checkout@v2
         with:
           # Required for Codecov report uploading.
           fetch-depth: 0
-      - run: make install-cc-test-reporter BIN_PATH=/usr/local/bin
-      - run: make build build-test test-update-linters lint
+      - run: make install-cc-test-reporter install-changelog BIN_PATH=/usr/local/bin
+      - run: make build build-test test-update-linters lint test-tidy test-changelog
       - run: make test-cover-upload
   e2e:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
       - uses: actions/cache@v2
         with:
           path: |
@@ -32,6 +32,8 @@ jobs:
             ${{ runner.os }}-go-
       - uses: actions/checkout@v2
       - uses: hashicorp/setup-terraform@v1
+      - name: Setup containerd
+        uses: crazy-max/ghaction-setup-containerd@v1.3.0
       - name: Fetch dependencies and configure tests
         run: |
           curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
@@ -47,9 +49,12 @@ jobs:
             nodes_cidr           = "172.17.0.0/24"
             node_ssh_port        = 2222
             workers_count        = 0
-            container_runtime    = "docker"
             cidr_ips_offset      = 1
-            kubelet_extra_args   = ["--fail-swap-on=false"]
+            kubelet_extra_args   = [
+              "--fail-swap-on=false",
+              "--container-runtime-endpoint=unix:///run/containerd/containerd.sock",
+            ]
+            cgroup_driver        = "cgroupfs"
           EOF
       - run: make build test-e2e-run TERRAFORM_BIN=terraform
   codespell:
@@ -59,6 +64,45 @@ jobs:
       - uses: codespell-project/actions-codespell@master
         with:
           skip: .git,go.sum
-          ignore_words_list: uptodate
+          ignore_words_list: uptodate,decorder
           check_filenames: true
           check_hidden: true
+  vagrant:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install vagrant
+        run: |
+          curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+          sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+          sudo apt-get update && sudo apt-get install vagrant
+      - run: make test-vagrant
+  semgrep:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      # Use dedicated action for nice integration with GitHub.
+      - uses: returntocorp/semgrep-action@v1
+  terraform:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Get dependencies
+        run: |
+          sudo apt-get update && sudo apt-get install -y gnupg software-properties-common curl
+          curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -
+          sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
+          sudo apt-get update && sudo apt-get install terraform
+      - run: |
+          terraform -chdir=libvirt init
+          make test-terraform
+  build-integration-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: make build-integration
+  build-e2e-image:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - run: make build-e2e

.gitignore

@@ -8,6 +8,8 @@ kubeconfig
 config.yaml
 state.yaml
 terraform.tfstate*
+.terraform.lock.hcl
+.terraform.tfstate.lock.info
 variables.auto.tfvars
 /c.out
 crash.log

.golangci.yml

@@ -13,9 +13,36 @@ issues:
   max-issues-per-linter: 0
   exclude-rules:
     - linters:
-      - forbidigo
+        - forbidigo
       text: "use of `fmt.Printf` forbidden by pattern"
 
+linters-settings:
+  errcheck:
+    check-type-assertions: true
+    check-blank: true
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/flexkube/terraform-provider-flexkube)
+  godot:
+    capital: true
+  gofumpt:
+    extra-rules: true
+  govet:
+    enable-all: true
+    disable:
+      - fieldalignment
+      - shadow
+  makezero:
+    always: true
+  nolintlint:
+    allow-leading-space: false
+    require-explanation: true
+    require-specific: true
+  wsl:
+    force-err-cuddling: true
+
 linters:
   disable:
     # Disabled until we implement some error types and migrate to use them.
@@ -24,26 +51,37 @@ linters:
     - gci
     # To be able to make use of Go zero-value feature.
     - exhaustivestruct
+    - exhaustruct
     # Allow replacements to force specific versions of dependencies.
     - gomoddirectives
     # Temporarily disable assertion checks, as it adds a lot of boilerplate to the code.
     - forcetypeassert
+    # To allow defensive approach when initializing structs.
+    - ireturn
+    # This linters should eventually be addressed and re-enabled.
+    - varnamelen
+    - errcheck
     # Those linters has been deprecated.
     - interfacer
     - maligned
-    - scopelint
     - golint
   enable:
     - asciicheck
+    - bidichk
     - bodyclose
+    - containedctx
+    - contextcheck
     - cyclop
     - deadcode
+    - decorder
     - depguard
     - dogsled
     - dupl
     - durationcheck
-    - errcheck
+    - errchkjson
+    - errname
     - errorlint
+    - execinquery
     - exhaustive
     - exportloopref
     - forbidigo
@@ -63,28 +101,33 @@ linters:
     - gomnd
     - gomodguard
     - goprintffuncname
+    - grouper
     - ifshort
     - importas
     - ineffassign
     - lll
+    - maintidx
     - makezero
     - misspell
     - nakedret
     - nestif
     - nilerr
+    - nilnil
     - nlreturn
     - noctx
     - nolintlint
+    - nonamedreturns
+    - nosprintfhostport
     - paralleltest
     - prealloc
     - predeclared
     - promlinter
     - revive
-    - rowserrcheck
     - sqlclosecheck
     - structcheck
     - stylecheck
     - tagliatelle
+    - tenv
     - testpackage
     - thelper
     - tparallel

.semgrep.yml

@@ -0,0 +1,43 @@
+rules:
+  - id: bad-error-wrap-wording
+    patterns:
+      - pattern-regex: fmt\.Errorf\(".?([Ff]ailed|[]Uu]nable|[Cc]ould|([Ee]rror))
+    message: Word "fail", "failed", "unable", "could not" should not be used when wrapping errors. Use verb in continuous form instead!
+    languages: [go]
+    severity: ERROR
+  - id: printed-messages-must-be-captialized
+    patterns:
+      - pattern-regex: (fmt.Print(ln|f)|\bt\.(Error|Fatal|Log)(|f))\("[a-z]
+    message: Printed messages must be capitalized.
+    languages: [go]
+    severity: ERROR
+  - id: strings-must-be-quoted-using-q
+    patterns:
+      - pattern-regex: "'%s'"
+    message: When formatting, strings must be quoted using %q instead of e.g. '%s'.
+    languages: [go]
+    severity: ERROR
+  - id: error-wrapping-must-be-preceded-by-space
+    patterns:
+      - pattern-regex: '[^ ]%w'
+    message: When wrapping errors, %w must be preceded by space.
+    languages: [go]
+    severity: ERROR
+  - id: files-must-not-have-trailing-whitespace
+    patterns:
+      - pattern-regex: '[[:blank:]]$'
+    message: Files must not have any trailing whitespace.
+    languages: [generic]
+    severity: ERROR
+  - id: files-must-not-have-trailing-newlines
+    patterns:
+      - pattern-regex: '\n\n\Z'
+    message: Files must not have any trailing newlines.
+    languages: [generic]
+    severity: ERROR
+  - id: all-lines-must-end-with-newline
+    patterns:
+      - pattern-regex: '\S\z'
+    message: All lines must end with newline.
+    languages: [generic]
+    severity: ERROR

CHANGELOG.md

@@ -5,9 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.7.0] - 2022-05-09
+### Changed
+- Updated `libflexkube` version to `v0.8.0`.
+- Updated remaining dependencies to latest versions.
+
+### Removed
+- `r/flexkube_kubelet_pool` parameters `network_plugin` and `pod_cidr` has been removed as they are no longer effective.
+
 ## [0.6.0] - 2021-09-02
 ### Changed
-- Updated `libflexkube` version to `v.7.0`.
+- Updated `libflexkube` version to `v0.7.0`.
 - Updated remaining dependencies to latest versions.
 
 ## [0.5.1] - 2021-05-31
@@ -52,6 +60,7 @@ in `libflexkube` and `flexkube_pki` and `flexkube_etcd_cluster` resources compla
 ### Changed
 - flexkube_containers: rename 'container' to 'host_configured_container'.
 
+[0.7.0]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.6.0...v0.7.0
 [0.6.0]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.5.1...v0.6.0
 [0.5.1]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.5.0...v0.5.1
 [0.5.0]: https://github.com/flexkube/terraform-provider-flexkube/compare/v0.4.1...v0.5.0

Makefile

@@ -13,7 +13,7 @@ GOBUILD=CGO_ENABLED=$(CGO_ENABLED) $(GOCMD) build -v -buildmode=exe -ldflags $(L
 GO_PACKAGES=./...
 GO_TESTS=^.*$
 
-GOLANGCI_LINT_VERSION=v1.40.1
+GOLANGCI_LINT_VERSION=v1.46.0
 
 BIN_PATH=$$HOME/bin
 
@@ -41,7 +41,7 @@ COVERPROFILE=c.out
 CC_TEST_REPORTER_ID=5bc3e58aca2ff47897d533ba92ae8db15ac9fdb83fad3637301ee5d75ccd4143
 
 .PHONY: all
-all: build build-test test lint
+all: build build-test test lint semgrep
 
 .PHONY: download
 download:
@@ -56,6 +56,10 @@ install-cc-test-reporter:
 	curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > $(BIN_PATH)/cc-test-reporter
 	chmod +x $(BIN_PATH)/cc-test-reporter
 
+.PHONY: install-changelog
+install-changelog:
+	go install github.com/rcmachado/changelog@0.7.0
+
 .PHONY: install-ci
 install-ci: install-golangci-lint install-cc-test-reporter
 
@@ -152,6 +156,10 @@ test-local-apply:
 build-e2e:
 	docker build -t $(E2E_IMAGE) e2e
 
+.PHONY: build-integration
+build-integration:
+	docker build -t $(INTEGRATION_IMAGE) integration
+
 .PHONY: vagrant-up
 vagrant-up:
 	$(VAGRANTCMD) up
@@ -222,3 +230,35 @@ test-e2e-run:
 test-e2e-destroy: TERRAFORM_BIN=$(TERRAFORM_ENV) /bin/terraform
 test-e2e-destroy:
 	$(TERRAFORM_BIN) -chdir=e2e destroy -auto-approve
+
+.PHONY: semgrep
+semgrep: SEMGREP_BIN=semgrep
+semgrep:
+	@if ! which $(SEMGREP_BIN) >/dev/null 2>&1; then echo "$(SEMGREP_BIN) binary not found, skipping extra linting"; else $(SEMGREP_BIN) --error; fi
+
+.PHONY: test-vagrant
+test-vagrant:
+	vagrant validate --ignore-provider
+
+.PHONY: test-changelog
+test-changelog: test-working-tree-clean
+	make format-changelog
+	@test -z "$$(git status --porcelain)" || (echo "Please run 'make format-changelog' and commit generated changes."; git diff; exit 1)
+
+.PHONY: test-working-tree-clean
+test-working-tree-clean:
+	@test -z "$$(git status --porcelain)" || (echo "Commit all changes before running this target"; exit 1)
+
+.PHONY: test-tidy
+test-tidy: test-working-tree-clean
+	go mod tidy
+	@test -z "$$(git status --porcelain)" || (echo "Please run 'go mod tidy' and commit generated changes."; git diff; exit 1)
+
+.PHONY: format-changelog
+format-changelog:
+	changelog fmt -o CHANGELOG.md.fmt
+	mv CHANGELOG.md.fmt CHANGELOG.md
+
+.PHONY: test-terraform
+test-terraform:
+	terraform -chdir=libvirt validate