.github/CODEOWNERS

@@ -0,0 +1,3 @@
+# Codeowners for scaleway/packer-plugin-scaleway
+
+* @remyleone

.github/workflows/unit-tests.yml

@@ -30,6 +30,8 @@ jobs:
         run: make build
       - name: Run unit tests
         run: make test
+      - name: Run e2e tests
+        run: make e2e_test
 
   generate:
     strategy:

.golangci.yml

@@ -17,6 +17,9 @@ issues:
     - linters:
         - lll
       source: "^//go:generate "
+    - linters:
+        - gomoddirectives
+      text: "replacement are not allowed"
 
   exclude-files:
     - ".*\\.hcl2spec\\.go$"
@@ -27,8 +30,15 @@ issues:
   # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
   max-same-issues: 0
 
+  # Enables exclude of directories:
+  # - vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
+  # Default: true
+  exclude-dirs-use-default: true
+
+  # make issues output unique by line, default is true
+  uniq-by-line: true
+
 linters:
-  disable-all: true
   enable:
     - asasalint # check for pass []any as any in variadic func(...any) [fast: false, auto-fix: false]
     - asciicheck # Simple linter to check that your code does not contain non-ASCII identifiers [fast: true, auto-fix: false]
@@ -45,6 +55,9 @@ linters:
     - errcheck # Errcheck is a program for checking for unchecked errors in go programs. These unchecked errors can be critical bugs in some cases [fast: false, auto-fix: false]
     - errchkjson # Checks types passed to the json encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted. [fast: false, auto-fix: false]
     - errname # Checks that sentinel errors are prefixed with the `Err` and error types are suffixed with the `Error`. [fast: false, auto-fix: false]
+    - errorlint # errorlint is a linter for that can be used to find code that will cause problems with the error wrapping scheme introduced in Go 1.13. [fast: false, auto-fix: false]
+    - exptostd # Detects functions from golang.org/x/exp/ that can be replaced by std functions. [auto-fix]
+    - fatcontext # Detects nested contexts in loops and function literals. [auto-fix]
     - forbidigo # Forbids identifiers [fast: true, auto-fix: false]
     - gci # Gci controls golang package import order and makes it always deterministic. [fast: true, auto-fix: false]
     - gocheckcompilerdirectives # Checks that go compiler directive comments (//go:) are valid. [fast: true, auto-fix: false]
@@ -56,12 +69,15 @@ linters:
     - gofumpt # Gofumpt checks whether code was gofumpt-ed. [fast: true, auto-fix: true]
     - goheader # Checks is file header matches to pattern [fast: true, auto-fix: false]
     - goimports # In addition to fixing imports, goimports also formats your code in the same style as gofmt. [fast: true, auto-fix: true]
+    - gomoddirectives # Manage the use of 'replace', 'retract', and 'excludes' directives in go.mod. [fast: true, auto-fix: false]
     - gomodguard # Allow and block list linter for direct Go module dependencies. This is different from depguard where there are different block types for example version constraints and module recommendations. [fast: true, auto-fix: false]
     - goprintffuncname # Checks that printf-like functions are named with `f` at the end [fast: true, auto-fix: false]
     - gosec #(gas): Inspects source code for security problems [fast: false, auto-fix: false]
     - gosimple #(megacheck): Linter for Go source code that specializes in simplifying a code [fast: false, auto-fix: false]
+    - gosmopolitan # Report certain i18n/l10n anti-patterns in your Go codebase [fast: false, auto-fix: false]
     - govet #(vet, vetshadow): Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string [fast: false, auto-fix: false]
     - grouper # An analyzer to analyze expression groups. [fast: true, auto-fix: false]
+    - iface # Detect the incorrect use of interfaces, helping developers avoid interface pollution. [auto-fix]
     - importas # Enforces consistent import aliases [fast: false, auto-fix: false]
     - ineffassign # Detects when assignments to existing variables are not used [fast: true, auto-fix: false]
     - intrange # intrange is a linter to find places where for loops could make use of an integer range. [fast: true, auto-fix: false]
@@ -73,6 +89,7 @@ linters:
     - musttag # enforce field tags in (un)marshaled structs [fast: false, auto-fix: false]
     - nakedret # Finds naked returns in functions greater than a specified function length [fast: true, auto-fix: false]
     - nilerr # Finds the code that returns nil even if it checks that the error is not nil. [fast: false, auto-fix: false]
+    - nlreturn # nlreturn checks for a new line before return and branch statements to increase code clarity [fast: true, auto-fix: true]
     - noctx # noctx finds sending http request without context.Context [fast: false, auto-fix: false]
     - nolintlint # Reports ill-formed or insufficient nolint directives [fast: true, auto-fix: false]
     - nosprintfhostport # Checks for misuse of Sprintf to construct a host with port in a URL. [fast: true, auto-fix: false]
@@ -88,8 +105,8 @@ linters:
     - sqlclosecheck # Checks that sql.Rows and sql.Stmt are closed. [fast: false, auto-fix: false]
     - staticcheck #(megacheck): Staticcheck is a go vet on steroids, applying a ton of static analysis checks [fast: false, auto-fix: false]
     - stylecheck # Stylecheck is a replacement for golint [fast: false, auto-fix: false]
+    - tagalign # check that struct tags are well aligned [fast: true, auto-fix: true]
     - tagliatelle # Checks the struct tags. [fast: true, auto-fix: false]
-    - tenv # tenv is analyzer that detects using os.Setenv instead of t.Setenv since Go1.17 [fast: false, auto-fix: false]
     - testifylint # Checks usage of github.com/stretchr/testify. [fast: false, auto-fix: false]
     - testpackage # linter that makes you use a separate _test package [fast: true, auto-fix: false]
     - thelper # thelper detects golang test helpers without t.Helper() call and checks the consistency of test helpers [fast: false, auto-fix: false]
@@ -98,10 +115,31 @@ linters:
     - unconvert # Remove unnecessary type conversions [fast: false, auto-fix: false]
     - unused #(megacheck): Checks Go code for unused constants, variables, functions and types [fast: false, auto-fix: false]
     - usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library. [fast: true, auto-fix: false]
+    - usetesting # Reports uses of functions with replacement inside the testing package. [auto-fix]
     - wastedassign # wastedassign finds wasted assignment statements. [fast: false, auto-fix: false]
     - whitespace # Tool for detection of leading and trailing whitespace [fast: true, auto-fix: true]
+    - wsl # Whitespace Linter - Forces you to use empty lines! [fast: true, auto-fix: false]
     - zerologlint # Detects the wrong usage of `zerolog` that a user forgets to dispatch with `Send` or `Msg` [fast: false, auto-fix: false]
-  fast: true
+
+  disable:
+    - cyclop # checks function and package cyclomatic complexity [fast: false, auto-fix: false]
+    - depguard # Go linter that checks if package imports are in a list of acceptable packages [fast: true, auto-fix: false]
+    - dupl # Tool for code clone detection [fast: true, auto-fix: false]
+    - err113 # Golang linter to check the errors handling expressions [fast: false, auto-fix: false]
+    - exhaustive # check exhaustiveness of enum switch statements [fast: false, auto-fix: false]
+    - forcetypeassert # finds forced type assertions [fast: true, auto-fix: false]
+    - funlen # Tool for detection of long functions [fast: true, auto-fix: false]
+    - gochecknoglobals # check that no global variables exist [fast: true, auto-fix: false]
+    - gochecknoinits # Checks that no init functions are present in Go code [fast: true, auto-fix: false]
+    - gocognit # Computes and checks the cognitive complexity of functions [fast: true, auto-fix: false]
+    - godot # Check if comments end in a period [fast: true, auto-fix: true]
+    - godox # Tool for detection of FIXME, TODO and other comment keywords [fast: true, auto-fix: false]
+    - lll # Reports long lines [fast: true, auto-fix: false]
+    - maintidx # maintidx measures the maintainability index of each function. [fast: true, auto-fix: false]
+    - mnd # An analyzer to detect magic numbers. [fast: true, auto-fix: false]
+    - nestif # Reports deeply nested if statements [fast: true, auto-fix: false]
+    - nilnil # Checks that there is no simultaneous return of `nil` error and an invalid value. [fast: false, auto-fix: false]
+    - varnamelen # checks that the length of a variable's name matches its scope [fast: false, auto-fix: false]
 
 # options for analysis running
 run:
@@ -121,50 +159,18 @@ run:
   #build-tags:
   #  - mytag
 
-  # which dirs to skip: issues from them won't be reported;
-  # can use regexp here: generated.*, regexp is applied on full path;
-  # default value is empty list, but default dirs are skipped independently
-  # from this option's value (see skip-dirs-use-default).
-  #skip-dirs:
-  #  - src/external_libs
-  #  - autogenerated_by_my_lib
-
-  # default is true. Enables skipping of directories:
-  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs-use-default: true
-
-  # which files to skip: they will be analyzed, but issues from them
-  # won't be reported. Default value is empty list, but there is
-  # no need to include all autogenerated files, we confidently recognize
-  # autogenerated files. If it's not please let us know.
-  skip-files:
-
-  #  - lib/bad.go
-
-  # by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
-  # If invoked with -mod=readonly, the go command is disallowed from the implicit
-  # automatic updating of go.mod described above. Instead, it fails when any changes
-  # to go.mod are needed. This setting is most useful to check that go.mod does
-  # not need updates, such as in a continuous integration and testing system.
-  # If invoked with -mod=vendor, the go command assumes that the vendor
-  # directory holds the correct copies of dependencies and ignores
-  # the dependency descriptions in go.mod.
-  # modules-download-mode: vendor
-
 # output configuration options
 output:
   # colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
-  formats: colored-line-number
+  formats:
+    - format: colored-line-number
 
   # print lines of code with issue, default is true
   print-issued-lines: true
 
   # print linter name in the end of issue text, default is true
   print-linter-name: true
 
-  # make issues output unique by line, default is true
-  uniq-by-line: true
-
 # all available settings of specific linters
 linters-settings:
   errcheck:
@@ -176,10 +182,12 @@ linters-settings:
     # default is false: such cases aren't reported by default.
     check-blank: false
 
-    # [deprecated] comma-separated list of pairs of the form pkg:regex
-    # the regex is used to ignore names within pkg. (default "fmt:.*").
-    # see https://github.com/kisielk/errcheck#the-deprecated-method for details
-    exclude-functions: fmt:.*,io/ioutil:^Read.*,io:Close
+    # List of functions to exclude from checking, where each entry is a single function to exclude.
+    # See https://github.com/kisielk/errcheck#excluding-functions for details.
+    exclude-functions:
+      - fmt:.*
+      - io/ioutil:^Read.*
+      - io:Close
 
   gosec:
    excludes:

.goreleaser.yml

@@ -7,7 +7,7 @@ before:
   hooks:
     # We strongly recommend running tests to catch any regression before release.
     # Even though, this an optional step.
-    - go test ./...
+    - make test
     # Check plugin compatibility with required version of the Packer SDK
     - make plugin-check
 builds:

.web-docs/components/builder/scaleway/README.md

@@ -88,7 +88,13 @@ can also be supplied to override the typical auto-generated key:
 - `boottype` (string) - The type of boot, can be either local or
   bootscript, Default bootscript
 
-- `remove_volume` (bool) - Remove Volume
+- `remove_volume` (bool) - RemoveVolume remove the temporary volumes created before running the server
+
+- `root_volume` (ConfigRootVolume) - RootVolumeType lets you configure the root volume
+  See the [RootVolume](#root-volume-configuration) documentation for fields.
+
+- `block_volume` ([]ConfigBlockVolume) - BlockVolumes define block volumes attached to the server alongside the default volume
+  See the [BlockVolumes](#block-volumes-configuration) documentation for fields.
 
 - `cleanup_machine_related_data` (string) - This value allows the user to remove information
   that is particular to the instance used to build the image
@@ -129,6 +135,34 @@ can also be supplied to override the typical auto-generated key:
 <!-- End of code generated from the comments of the Config struct in builder/scaleway/config.go; -->
 
 
+### Block volumes configuration
+
+<!-- Code generated from the comments of the ConfigBlockVolume struct in builder/scaleway/config.go; DO NOT EDIT MANUALLY -->
+
+- `name` (string) - The name of the created volume
+
+- `snapshot_id` (string) - ID of the snapshot to create the volume from
+
+- `size_in_gb` (uint64) - Size of the newly created volume
+
+- `iops` (\*uint32) - IOPS is the number of requested iops for the server's volume. This will not impact created snapshot.
+
+<!-- End of code generated from the comments of the ConfigBlockVolume struct in builder/scaleway/config.go; -->
+
+
+### Root volume configuration
+
+<!-- Code generated from the comments of the ConfigRootVolume struct in builder/scaleway/config_root_volume.go; DO NOT EDIT MANUALLY -->
+
+- `type` (string) - The type of the root volume
+
+- `iops` (\*uint32) - IOPS of the root volume if using SBS, will only affect runtime. Image's volumes cannot have a configured IOPS.
+
+- `size_in_gb` (uint64) - Size of the root volume
+
+<!-- End of code generated from the comments of the ConfigRootVolume struct in builder/scaleway/config_root_volume.go; -->
+
+
 ## Basic Example
 
 Here is a basic example. It is completely valid as soon as you enter your own

GNUmakefile

@@ -3,7 +3,8 @@ BINARY=packer-plugin-${NAME}
 PLUGIN_FQN="$(shell grep -E '^module' <go.mod | sed -E 's/module *//')"
 
 COUNT?=1
-TEST?=$(shell go list ./...)
+E2E_TEST?=$(shell go list ./internal/tests)
+TEST?=$(filter-out $(E2E_TEST),$(shell go list ./...))
 HASHICORP_PACKER_PLUGIN_SDK_VERSION?=$(shell go list -m github.com/hashicorp/packer-plugin-sdk | cut -d " " -f2)
 
 .PHONY: dev
@@ -16,7 +17,10 @@ dev:
 	packer plugins install --path ${BINARY} "$(shell echo "${PLUGIN_FQN}" | sed 's/packer-plugin-//')"
 
 test:
-	@go test -race -count $(COUNT) $(TEST) -timeout=3m
+	@go test -count $(COUNT) $(TEST) -timeout=3m
+
+e2e_test:
+	make -C e2e_tests test
 
 install-packer-sdc: ## Install packer sofware development command
 	go install github.com/hashicorp/packer-plugin-sdk/cmd/packer-sdc@${HASHICORP_PACKER_PLUGIN_SDK_VERSION}

builder/scaleway/api.go

@@ -0,0 +1,31 @@
+package scaleway
+
+import (
+	"encoding/json"
+	"errors"
+	_ "unsafe" // Import required for link
+
+	"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
+)
+
+//go:linkname createServer github.com/scaleway/scaleway-sdk-go/api/instance/v1.(*API).createServer
+func createServer(*instance.API, *instance.CreateServerRequest, ...scw.RequestOption) (*instance.CreateServerResponse, error)
+
+func newResponseErrorFromBody(rawBody []byte) error {
+	responseError := scw.ResponseError{}
+	_ = json.Unmarshal(rawBody, &responseError)
+
+	return &responseError
+}
+
+// formatNonStandardError provides a way to format non-standard errors returned by instance's API.
+// If error is not detected as non-standard, format will be no-op.
+func formatInstanceError(err error) error {
+	preconditionFailedError := &scw.PreconditionFailedError{}
+	if errors.As(err, &preconditionFailedError) && preconditionFailedError.Precondition == "" {
+		return newResponseErrorFromBody(preconditionFailedError.RawBody)
+	}
+
+	return err
+}

builder/scaleway/artifact.go

@@ -68,17 +68,21 @@ func (a *Artifact) State(name string) interface{} {
 		)
 		if err != nil {
 			log.Printf("error when creating hcp registry image %v", err)
+
 			return nil
 		}
+
 		return img
 	}
+
 	return a.StateData[name]
 }
 
 func (a *Artifact) Destroy() error {
 	instanceAPI := instance.NewAPI(a.Client)
 
 	log.Printf("Destroying image: %s (%s)", a.ImageID, a.ImageName)
+
 	err := instanceAPI.DeleteImage(&instance.DeleteImageRequest{
 		ImageID: a.ImageID,
 	})
@@ -87,6 +91,7 @@ func (a *Artifact) Destroy() error {
 	}
 
 	log.Printf("Destroying snapshots: %v", a.Snapshots)
+
 	for _, snapshot := range a.Snapshots {
 		err = instanceAPI.DeleteSnapshot(&instance.DeleteSnapshotRequest{
 			SnapshotID: snapshot.ID,

builder/scaleway/artifact_test.go

@@ -9,6 +9,7 @@ import (
 
 func TestArtifact_Impl(t *testing.T) {
 	var raw interface{}
+
 	raw = &scaleway.Artifact{}
 	if _, ok := raw.(packersdk.Artifact); !ok {
 		t.Fatalf("Artifact should be artifact")
@@ -81,6 +82,7 @@ func TestArtifactState_StateData(t *testing.T) {
 
 	// Nil StateData should not fail and should return nil
 	artifact = &scaleway.Artifact{}
+
 	result = artifact.State("key")
 	if result != nil {
 		t.Fatalf("Bad: State should be nil for nil StateData")