move files out of osc

Signed-off-by: matthias.gatto <[email protected]>
outscale · Feb 20, 2024 · 35975ce · 35975ce
1 parent 54df6a2
commit 35975ce
Show file tree

Hide file tree

Showing 89 changed files with 29 additions and 29 deletions.
diff --git a/builder/osc/bsu/builder.go → builder/bsu/builder.go b/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

diff --git a/builder/osc/bsu/builder.hcl2spec.go → builder/bsu/builder.hcl2spec.go b/builder/osc/bsu/builder.hcl2spec.go → builder/bsu/builder.hcl2spec.go
diff --git a/builder/osc/bsu/builder_acc_test.go → builder/bsu/builder_acc_test.go b/builder/osc/bsu/builder_acc_test.go → builder/bsu/builder_acc_test.go
diff --git a/builder/osc/bsu/builder_test.go → builder/bsu/builder_test.go b/builder/osc/bsu/builder_test.go → builder/bsu/builder_test.go
diff --git a/builder/osc/bsu/step_create_omi.go → builder/bsu/step_create_omi.go b/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 {

diff --git a/builder/osc/bsusurrogate/builder.go → builder/bsusurrogate/builder.go b/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"

diff --git a/builder/osc/bsusurrogate/builder.hcl2spec.go → builder/bsusurrogate/builder.hcl2spec.go b/builder/osc/bsusurrogate/builder.hcl2spec.go → builder/bsusurrogate/builder.hcl2spec.go
diff --git a/builder/osc/bsusurrogate/builder_acc_test.go → builder/bsusurrogate/builder_acc_test.go b/builder/osc/bsusurrogate/builder_acc_test.go → builder/bsusurrogate/builder_acc_test.go
diff --git a/builder/osc/bsusurrogate/builder_test.go → builder/bsusurrogate/builder_test.go b/builder/osc/bsusurrogate/builder_test.go → builder/bsusurrogate/builder_test.go
diff --git a/...der/osc/bsusurrogate/root_block_device.go → builder/bsusurrogate/root_block_device.go b/...der/osc/bsusurrogate/root_block_device.go → builder/bsusurrogate/root_block_device.go
diff --git a/...der/osc/bsusurrogate/step_register_omi.go → builder/bsusurrogate/step_register_omi.go b/...der/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.

diff --git a/...osc/bsusurrogate/step_snapshop_volumes.go → ...der/bsusurrogate/step_snapshop_volumes.go b/...osc/bsusurrogate/step_snapshop_volumes.go → ...der/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.

diff --git a/builder/osc/bsuvolume/artifact.go → builder/bsuvolume/artifact.go b/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

diff --git a/builder/osc/bsuvolume/artifact_test.go → builder/bsuvolume/artifact_test.go b/builder/osc/bsuvolume/artifact_test.go → builder/bsuvolume/artifact_test.go
diff --git a/builder/osc/bsuvolume/block_device.go → builder/bsuvolume/block_device.go b/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 {

diff --git a/builder/osc/bsuvolume/builder.go → builder/bsuvolume/builder.go b/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"

diff --git a/builder/osc/bsuvolume/builder.hcl2spec.go → builder/bsuvolume/builder.hcl2spec.go b/builder/osc/bsuvolume/builder.hcl2spec.go → builder/bsuvolume/builder.hcl2spec.go
diff --git a/builder/osc/bsuvolume/builder_acc_test.go → builder/bsuvolume/builder_acc_test.go b/builder/osc/bsuvolume/builder_acc_test.go → builder/bsuvolume/builder_acc_test.go
diff --git a/builder/osc/bsuvolume/builder_test.go → builder/bsuvolume/builder_test.go b/builder/osc/bsuvolume/builder_test.go → builder/bsuvolume/builder_test.go
diff --git a/...der/osc/bsuvolume/step_tag_bsu_volumes.go → builder/bsuvolume/step_tag_bsu_volumes.go b/...der/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 {

diff --git a/builder/osc/chroot/builder.go → builder/chroot/builder.go b/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

diff --git a/builder/osc/chroot/builder.hcl2spec.go → builder/chroot/builder.hcl2spec.go b/builder/osc/chroot/builder.hcl2spec.go → builder/chroot/builder.hcl2spec.go
diff --git a/builder/osc/chroot/cleanup.go → builder/chroot/cleanup.go b/builder/osc/chroot/cleanup.go → builder/chroot/cleanup.go
diff --git a/builder/osc/chroot/command.go → builder/chroot/command.go b/builder/osc/chroot/command.go → builder/chroot/command.go
diff --git a/builder/osc/chroot/communicator.go → builder/chroot/communicator.go b/builder/osc/chroot/communicator.go → builder/chroot/communicator.go
diff --git a/builder/osc/chroot/communicator_test.go → builder/chroot/communicator_test.go b/builder/osc/chroot/communicator_test.go → builder/chroot/communicator_test.go
diff --git a/builder/osc/chroot/device.go → builder/chroot/device.go b/builder/osc/chroot/device.go → builder/chroot/device.go
diff --git a/builder/osc/chroot/lockfile.go → builder/chroot/lockfile.go b/builder/osc/chroot/lockfile.go → builder/chroot/lockfile.go
diff --git a/builder/osc/chroot/lockfile_unix.go → builder/chroot/lockfile_unix.go b/builder/osc/chroot/lockfile_unix.go → builder/chroot/lockfile_unix.go
diff --git a/builder/osc/chroot/run_local_commands.go → builder/chroot/run_local_commands.go b/builder/osc/chroot/run_local_commands.go → builder/chroot/run_local_commands.go
diff --git a/builder/osc/chroot/step_check_root_device.go → builder/chroot/step_check_root_device.go b/builder/osc/chroot/step_check_root_device.go → builder/chroot/step_check_root_device.go
diff --git a/builder/osc/chroot/step_chroot_provision.go → builder/chroot/step_chroot_provision.go b/builder/osc/chroot/step_chroot_provision.go → builder/chroot/step_chroot_provision.go
diff --git a/builder/osc/chroot/step_copy_files.go → builder/chroot/step_copy_files.go b/builder/osc/chroot/step_copy_files.go → builder/chroot/step_copy_files.go
diff --git a/builder/osc/chroot/step_copy_files_test.go → builder/chroot/step_copy_files_test.go b/builder/osc/chroot/step_copy_files_test.go → builder/chroot/step_copy_files_test.go
diff --git a/builder/osc/chroot/step_create_omi.go → builder/chroot/step_create_omi.go b/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.

diff --git a/builder/osc/chroot/step_create_volume.go → builder/chroot/step_create_volume.go b/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

diff --git a/builder/osc/chroot/step_early_cleanup.go → builder/chroot/step_early_cleanup.go b/builder/osc/chroot/step_early_cleanup.go → builder/chroot/step_early_cleanup.go
diff --git a/builder/osc/chroot/step_early_unflock.go → builder/chroot/step_early_unflock.go b/builder/osc/chroot/step_early_unflock.go → builder/chroot/step_early_unflock.go
diff --git a/builder/osc/chroot/step_flock.go → builder/chroot/step_flock.go b/builder/osc/chroot/step_flock.go → builder/chroot/step_flock.go
diff --git a/builder/osc/chroot/step_link_volume.go → builder/chroot/step_link_volume.go b/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

diff --git a/builder/osc/chroot/step_mount_device.go → builder/chroot/step_mount_device.go b/builder/osc/chroot/step_mount_device.go → builder/chroot/step_mount_device.go
diff --git a/builder/osc/chroot/step_mount_extra.go → builder/chroot/step_mount_extra.go b/builder/osc/chroot/step_mount_extra.go → builder/chroot/step_mount_extra.go
diff --git a/...er/osc/chroot/step_post_mount_commands.go → builder/chroot/step_post_mount_commands.go b/...er/osc/chroot/step_post_mount_commands.go → builder/chroot/step_post_mount_commands.go
diff --git a/...der/osc/chroot/step_pre_mount_commands.go → builder/chroot/step_pre_mount_commands.go b/...der/osc/chroot/step_pre_mount_commands.go → builder/chroot/step_pre_mount_commands.go
diff --git a/builder/osc/chroot/step_prepare_device.go → builder/chroot/step_prepare_device.go b/builder/osc/chroot/step_prepare_device.go → builder/chroot/step_prepare_device.go
diff --git a/builder/osc/chroot/step_snapshot.go → builder/chroot/step_snapshot.go b/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.

diff --git a/builder/osc/chroot/step_vm_info.go → builder/chroot/step_vm_info.go b/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.

diff --git a/builder/osc/common/access_config.go → builder/common/access_config.go b/builder/osc/common/access_config.go → builder/common/access_config.go
diff --git a/builder/osc/common/access_config_test.go → builder/common/access_config_test.go b/builder/osc/common/access_config_test.go → builder/common/access_config_test.go
diff --git a/builder/osc/common/artifact.go → builder/common/artifact.go b/builder/osc/common/artifact.go → builder/common/artifact.go
diff --git a/builder/osc/common/artifact_test.go → builder/common/artifact_test.go b/builder/osc/common/artifact_test.go → builder/common/artifact_test.go
diff --git a/builder/osc/common/block_device.go → builder/common/block_device.go b/builder/osc/common/block_device.go → builder/common/block_device.go
diff --git a/builder/osc/common/block_device_test.go → builder/common/block_device_test.go b/builder/osc/common/block_device_test.go → builder/common/block_device_test.go
diff --git a/builder/osc/common/build_filters.go → builder/common/build_filters.go b/builder/osc/common/build_filters.go → builder/common/build_filters.go
diff --git a/builder/osc/common/interpolate_build_info.go → builder/common/interpolate_build_info.go b/builder/osc/common/interpolate_build_info.go → builder/common/interpolate_build_info.go
diff --git a/...osc/common/interpolate_build_info_test.go → ...der/common/interpolate_build_info_test.go b/...osc/common/interpolate_build_info_test.go → ...der/common/interpolate_build_info_test.go
diff --git a/builder/osc/common/omi_config.go → builder/common/omi_config.go b/builder/osc/common/omi_config.go → builder/common/omi_config.go
diff --git a/builder/osc/common/omi_config_test.go → builder/common/omi_config_test.go b/builder/osc/common/omi_config_test.go → builder/common/omi_config_test.go
diff --git a/builder/osc/common/omi_filter.go → builder/common/omi_filter.go b/builder/osc/common/omi_filter.go → builder/common/omi_filter.go
diff --git a/builder/osc/common/retry/retry.go → builder/common/retry/retry.go b/builder/osc/common/retry/retry.go → builder/common/retry/retry.go
diff --git a/builder/osc/common/retry/retry_test.go → builder/common/retry/retry_test.go b/builder/osc/common/retry/retry_test.go → builder/common/retry/retry_test.go
diff --git a/builder/osc/common/run_config.go → builder/common/run_config.go b/builder/osc/common/run_config.go → builder/common/run_config.go
diff --git a/builder/osc/common/run_config.hcl2spec.go → builder/common/run_config.hcl2spec.go b/builder/osc/common/run_config.hcl2spec.go → builder/common/run_config.hcl2spec.go
diff --git a/builder/osc/common/run_config_test.go → builder/common/run_config_test.go b/builder/osc/common/run_config_test.go → builder/common/run_config_test.go
diff --git a/builder/osc/common/ssh.go → builder/common/ssh.go b/builder/osc/common/ssh.go → builder/common/ssh.go
diff --git a/builder/osc/common/state.go → builder/common/state.go b/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)

diff --git a/builder/osc/common/step_cleanup_volumes.go → builder/common/step_cleanup_volumes.go b/builder/osc/common/step_cleanup_volumes.go → builder/common/step_cleanup_volumes.go
diff --git a/builder/osc/common/step_create_tags.go → builder/common/step_create_tags.go b/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 {

diff --git a/builder/osc/common/step_deregister_omi.go → builder/common/step_deregister_omi.go b/builder/osc/common/step_deregister_omi.go → builder/common/step_deregister_omi.go
diff --git a/builder/osc/common/step_get_password.go → builder/common/step_get_password.go b/builder/osc/common/step_get_password.go → builder/common/step_get_password.go
diff --git a/builder/osc/common/step_key_pair.go → builder/common/step_key_pair.go b/builder/osc/common/step_key_pair.go → builder/common/step_key_pair.go
diff --git a/builder/osc/common/step_network_info.go → builder/common/step_network_info.go b/builder/osc/common/step_network_info.go → builder/common/step_network_info.go
diff --git a/builder/osc/common/step_pre_validate.go → builder/common/step_pre_validate.go b/builder/osc/common/step_pre_validate.go → builder/common/step_pre_validate.go
diff --git a/builder/osc/common/step_public_ip.go → builder/common/step_public_ip.go b/builder/osc/common/step_public_ip.go → builder/common/step_public_ip.go
diff --git a/builder/osc/common/step_run_source_vm.go → builder/common/step_run_source_vm.go b/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 (

diff --git a/builder/osc/common/step_security_group.go → builder/common/step_security_group.go b/builder/osc/common/step_security_group.go → builder/common/step_security_group.go
diff --git a/builder/osc/common/step_source_omi_info.go → builder/common/step_source_omi_info.go b/builder/osc/common/step_source_omi_info.go → builder/common/step_source_omi_info.go
diff --git a/...r/osc/common/step_source_omi_info_test.go → builder/common/step_source_omi_info_test.go b/...r/osc/common/step_source_omi_info_test.go → builder/common/step_source_omi_info_test.go
diff --git a/...der/osc/common/step_stop_bsu_backed_vm.go → builder/common/step_stop_bsu_backed_vm.go b/...der/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 {

diff --git a/builder/osc/common/step_update_bsu_vm.go → builder/common/step_update_bsu_vm.go b/builder/osc/common/step_update_bsu_vm.go → builder/common/step_update_bsu_vm.go
diff --git a/builder/osc/common/step_update_omi.go → builder/common/step_update_omi.go b/builder/osc/common/step_update_omi.go → builder/common/step_update_omi.go
diff --git a/builder/osc/common/step_update_omi_test.go → builder/common/step_update_omi_test.go b/builder/osc/common/step_update_omi_test.go → builder/common/step_update_omi_test.go
diff --git a/builder/osc/common/tags.go → builder/common/tags.go b/builder/osc/common/tags.go → builder/common/tags.go
diff --git a/builder/osc/common/temp_const.go → builder/common/temp_const.go b/builder/osc/common/temp_const.go → builder/common/temp_const.go
diff --git a/builder/osc/common/template_funcs.go → builder/common/template_funcs.go b/builder/osc/common/template_funcs.go → builder/common/template_funcs.go
diff --git a/builder/osc/common/transport.go → builder/common/transport.go b/builder/osc/common/transport.go → builder/common/transport.go
diff --git a/datasource/omi/data.go b/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"
 )
 

diff --git a/datasource/omi/data_test.go b/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) {

diff --git a/main.go b/main.go
@@ -6,10 +6,10 @@ import (
 
 	"github.com/hashicorp/packer-plugin-sdk/plugin"
 
-	"github.com/outscale/packer-plugin-outscale/builder/osc/bsu"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/bsusurrogate"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/bsuvolume"
-	"github.com/outscale/packer-plugin-outscale/builder/osc/chroot"
+	"github.com/outscale/packer-plugin-outscale/builder/bsu"
+	"github.com/outscale/packer-plugin-outscale/builder/bsusurrogate"
+	"github.com/outscale/packer-plugin-outscale/builder/bsuvolume"
+	"github.com/outscale/packer-plugin-outscale/builder/chroot"
 	"github.com/outscale/packer-plugin-outscale/datasource/omi"
 	"github.com/outscale/packer-plugin-outscale/version"
 )