Refacto

.github/workflows/ensure-docs-compiled.yaml

@@ -8,6 +8,8 @@ jobs:
       - name: Checkout 🛎
         uses: actions/checkout@v2
       - uses: actions/setup-go@v4
+        with:
+          go-version: 'stable'
       - shell: bash
         run: make generate
       - shell: bash

.web-docs/README.md

@@ -33,9 +33,9 @@ If you do that, you can remove `required_plugins` from packer file.
 
 #### Builders
 
--> **Don't know which builder to use?** If in doubt, use the [osc-bsu builder](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsu). It is much easier to use and Outscale generally recommends BSU-backed images nowadays.
+-> **Don't know which builder to use?** If in doubt, use the [osc-bsu builder](/packer/integrations/outscale/outscale/latest/components/builder/bsu). It is much easier to use and Outscale generally recommends BSU-backed images nowadays.
 
-- [outscale-bsu](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsu) - Create BSU-backed OMIs by
+- [outscale-bsu](/packer/integrations/outscale/outscale/latest/components/builder/bsu) - Create BSU-backed OMIs by
   launching a source OMI and re-packaging it into a new OMI after
   provisioning. If in doubt, use this builder, which is the easiest to get
   started with.
@@ -45,10 +45,10 @@ If you do that, you can remove `required_plugins` from packer file.
   that device. This is an **advanced builder and should not be used by
   newcomers**. However, it is also the fastest way to build an EBS-backed OMI
   since no new OUTSCALE VM needs to be launched.
-- [outscale-bsusurrogate](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsusurrogate) - Create BSU-backed OMIs from scratch. Works similarly to the `chroot` builder but does
+- [outscale-bsusurrogate](/packer/integrations/outscale/outscale/latest/components/builder/bsusurrogate) - Create BSU-backed OMIs from scratch. Works similarly to the `chroot` builder but does
   not require running in Outscale VM. This is an **advanced builder and should not be
   used by newcomers**.
-- [outscale-bsuvolume](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsuvolume) - Create EBS volumes by launching a source OMI with block devices mapped. Provision the VM, then destroy it, retaining the EBS volumes.
+- [outscale-bsuvolume](/packer/integrations/outscale/outscale/latest/components/builder/bsuvolume) - Create EBS volumes by launching a source OMI with block devices mapped. Provision the VM, then destroy it, retaining the EBS volumes.
 
 #### Data Sources
 - [outscale-omi](/packer/integrations/outscale/outscale/latest/components/data-source/omi) - The Outscale OMI Data source will filter and fetch an Outscale OMI.

GNUmakefile

@@ -8,28 +8,28 @@ HASHICORP_PACKER_PLUGIN_SDK_VERSION?=$(shell go list -m github.com/hashicorp/pac
 .PHONY: dev
 
 build:
-	@go build -o ${BINARY}
+	go build -o ${BINARY}
 
 dev: build
-	@mkdir -p ~/.packer.d/plugins/
-	@mv ${BINARY} ~/.packer.d/plugins/${BINARY}
+	mkdir -p ~/.packer.d/plugins/
+	mv ${BINARY} ~/.packer.d/plugins/${BINARY}
 
 test:
-	@go test -race -count $(COUNT) $(TEST) -timeout=3m
+	go test -race -count $(COUNT) $(TEST) -timeout=3m
 
 install-packer-sdc: ## Install packer sofware development command
-	@go install github.com/hashicorp/packer-plugin-sdk/cmd/packer-sdc@${HASHICORP_PACKER_PLUGIN_SDK_VERSION}
+	go install github.com/hashicorp/packer-plugin-sdk/cmd/packer-sdc@${HASHICORP_PACKER_PLUGIN_SDK_VERSION}
 
 plugin-check: install-packer-sdc build
-	@packer-sdc plugin-check ${BINARY}
+	packer-sdc plugin-check ${BINARY}
 
 testacc: dev
 	@PACKER_ACC=1 go test -count $(COUNT) -v $(TEST) -timeout=120m
 
 generate: install-packer-sdc
-	@go generate ./...
-	@if [ -d ".docs" ]; then rm -r ".docs"; fi
+	go generate ./...
+	if [ -d ".docs" ]; then rm -r ".docs"; fi
 	packer-sdc renderdocs -src "docs" -partials docs-partials/ -dst ".docs/"
-	@./.web-docs/scripts/compile-to-webdocs.sh "." ".docs" ".web-docs" "outscale"
-	@rm -r ".docs"
+	./.web-docs/scripts/compile-to-webdocs.sh "." ".docs" ".web-docs" "outscale"
+	rm -r ".docs"
 	# checkout the .docs folder for a preview of the docs

builder/osc/bsu/builder.go → builder/bsu/builder.go

@@ -19,7 +19,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // The unique ID for this builder

builder/osc/bsu/step_create_omi.go → builder/bsu/step_create_omi.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 type stepCreateOMI struct {

builder/osc/bsusurrogate/builder.go → builder/bsusurrogate/builder.go

@@ -17,7 +17,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 const BuilderId = "oapi.outscale.bsusurrogate"

builder/osc/bsusurrogate/step_register_omi.go → builder/bsusurrogate/step_register_omi.go

@@ -9,7 +9,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/outscale/osc-sdk-go/v2"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // StepRegisterOMI creates the OMI.

builder/osc/bsusurrogate/step_snapshop_volumes.go → builder/bsusurrogate/step_snapshop_volumes.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // StepSnapshotVolumes creates snapshots of the created volumes.

builder/osc/bsuvolume/artifact.go → builder/bsuvolume/artifact.go

@@ -9,7 +9,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	registryimage "github.com/hashicorp/packer-plugin-sdk/packer/registry/image"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // map of region to list of volume IDs

builder/osc/bsuvolume/block_device.go → builder/bsuvolume/block_device.go

@@ -2,7 +2,7 @@ package bsuvolume
 
 import (
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 type BlockDevice struct {

builder/osc/bsuvolume/builder.go → builder/bsuvolume/builder.go

@@ -17,7 +17,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 const BuilderId = "oapi.outscale.bsuvolume"

builder/osc/bsuvolume/step_tag_bsu_volumes.go → builder/bsuvolume/step_tag_bsu_volumes.go

@@ -8,7 +8,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 type stepTagBSUVolumes struct {

builder/osc/chroot/builder.go → builder/chroot/builder.go

@@ -18,7 +18,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // The unique ID for this builder

builder/osc/chroot/step_create_omi.go → builder/chroot/step_create_omi.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // StepCreateOMI creates the OMI.

builder/osc/chroot/step_create_volume.go → builder/chroot/step_create_volume.go

@@ -10,7 +10,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // StepCreateVolume creates a new volume from the snapshot of the root

builder/osc/chroot/step_link_volume.go → builder/chroot/step_link_volume.go

@@ -7,7 +7,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // StepLinkVolume attaches the previously created volume to an

builder/osc/chroot/step_snapshot.go → builder/chroot/step_snapshot.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // StepSnapshot creates a snapshot of the created volume.

builder/osc/chroot/step_vm_info.go → builder/chroot/step_vm_info.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 // StepVmInfo verifies that this builder is running on an Outscale vm.

builder/osc/common/state.go → builder/common/state.go

@@ -5,7 +5,7 @@ import (
 	"log"
 
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/common/retry"
+	"github.com/outscale/packer-plugin-outscale/builder/common/retry"
 )
 
 type stateRefreshFunc func() (string, error)

builder/osc/common/step_create_tags.go → builder/common/step_create_tags.go

@@ -9,7 +9,7 @@ import (
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/common/retry"
+	"github.com/outscale/packer-plugin-outscale/builder/common/retry"
 )
 
 type StepCreateTags struct {

builder/osc/common/step_run_source_vm.go → builder/common/step_run_source_vm.go

@@ -16,7 +16,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/common/retry"
+	"github.com/outscale/packer-plugin-outscale/builder/common/retry"
 )
 
 const (

builder/osc/common/step_stop_bsu_backed_vm.go → builder/common/step_stop_bsu_backed_vm.go

@@ -8,7 +8,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/multistep"
 	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/common/retry"
+	"github.com/outscale/packer-plugin-outscale/builder/common/retry"
 )
 
 type StepStopBSUBackedVm struct {

datasource/omi/data.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
 	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 	oscgo "github.com/outscale/osc-sdk-go/v2"
-	osccommon "github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	osccommon "github.com/outscale/packer-plugin-outscale/builder/common"
 	"github.com/zclconf/go-cty/cty"
 )
 

datasource/omi/data_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/packer-plugin-sdk/template/config"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/common"
+	"github.com/outscale/packer-plugin-outscale/builder/common"
 )
 
 func TestDatasourceConfigure_FilterBlank(t *testing.T) {

docs/README.md

@@ -33,9 +33,9 @@ If you do that, you can remove `required_plugins` from packer file.
 
 #### Builders
 
--> **Don't know which builder to use?** If in doubt, use the [osc-bsu builder](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsu). It is much easier to use and Outscale generally recommends BSU-backed images nowadays.
+-> **Don't know which builder to use?** If in doubt, use the [osc-bsu builder](/packer/integrations/outscale/outscale/latest/components/builder/bsu). It is much easier to use and Outscale generally recommends BSU-backed images nowadays.
 
-- [outscale-bsu](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsu) - Create BSU-backed OMIs by
+- [outscale-bsu](/packer/integrations/outscale/outscale/latest/components/builder/bsu) - Create BSU-backed OMIs by
   launching a source OMI and re-packaging it into a new OMI after
   provisioning. If in doubt, use this builder, which is the easiest to get
   started with.
@@ -45,10 +45,10 @@ If you do that, you can remove `required_plugins` from packer file.
   that device. This is an **advanced builder and should not be used by
   newcomers**. However, it is also the fastest way to build an EBS-backed OMI
   since no new OUTSCALE VM needs to be launched.
-- [outscale-bsusurrogate](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsusurrogate) - Create BSU-backed OMIs from scratch. Works similarly to the `chroot` builder but does
+- [outscale-bsusurrogate](/packer/integrations/outscale/outscale/latest/components/builder/bsusurrogate) - Create BSU-backed OMIs from scratch. Works similarly to the `chroot` builder but does
   not require running in Outscale VM. This is an **advanced builder and should not be
   used by newcomers**.
-- [outscale-bsuvolume](/packer/integrations/outscale/outscale/latest/components/builder/osc/bsuvolume) - Create EBS volumes by launching a source OMI with block devices mapped. Provision the VM, then destroy it, retaining the EBS volumes.
+- [outscale-bsuvolume](/packer/integrations/outscale/outscale/latest/components/builder/bsuvolume) - Create EBS volumes by launching a source OMI with block devices mapped. Provision the VM, then destroy it, retaining the EBS volumes.
 
 #### Data Sources
 - [outscale-omi](/packer/integrations/outscale/outscale/latest/components/data-source/omi) - The Outscale OMI Data source will filter and fetch an Outscale OMI.