diff --git a/builder/osc/bsu/builder.go b/builder/osc/bsu/builder.go index 2a32f40ff..7c2cca0a3 100644 --- a/builder/osc/bsu/builder.go +++ b/builder/osc/bsu/builder.go @@ -9,9 +9,7 @@ package bsu import ( "context" - "crypto/tls" "fmt" - "net/http" "github.com/hashicorp/hcl/v2/hcldec" osccommon "github.com/hashicorp/packer/builder/osc/common" @@ -21,7 +19,6 @@ import ( "github.com/hashicorp/packer/helper/multistep" "github.com/hashicorp/packer/packer" "github.com/hashicorp/packer/template/interpolate" - "github.com/outscale/osc-go/oapi" ) // The unique ID for this builder @@ -86,25 +83,11 @@ func (b *Builder) Prepare(raws ...interface{}) ([]string, []string, error) { } func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (packer.Artifact, error) { - clientConfig, err := b.config.Config() - if err != nil { - return nil, err - } - - skipClient := &http.Client{ - Transport: &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, - }, - } - - oapiconn := oapi.NewClient(clientConfig, skipClient) - oscConn := b.config.NewOSCClient() // Setup the state bag and initial state for the steps state := new(multistep.BasicStateBag) state.Put("config", &b.config) - state.Put("oapi", oapiconn) state.Put("osc", oscConn) state.Put("accessConfig", &b.config.AccessConfig) state.Put("hook", hook) @@ -224,7 +207,6 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack artifact := &osccommon.Artifact{ Omis: omis.(map[string]string), BuilderIdValue: BuilderId, - Config: clientConfig, StateData: map[string]interface{}{"generated_data": state.Get("generated_data")}, } diff --git a/builder/osc/bsu/builder_acc_test.go b/builder/osc/bsu/builder_acc_test.go index 991922d52..2776af243 100644 --- a/builder/osc/bsu/builder_acc_test.go +++ b/builder/osc/bsu/builder_acc_test.go @@ -2,13 +2,9 @@ package bsu import ( - "crypto/tls" - "net/http" "testing" - "github.com/hashicorp/packer/builder/osc/common" builderT "github.com/hashicorp/packer/helper/builder/testing" - "github.com/outscale/osc-go/oapi" ) func TestBuilderAcc_basic(t *testing.T) { @@ -23,22 +19,6 @@ func TestBuilderAcc_basic(t *testing.T) { func testAccPreCheck(t *testing.T) { } -func testOAPIConn() (*oapi.Client, error) { - access := &common.AccessConfig{RawRegion: "us-east-1"} - clientConfig, err := access.Config() - if err != nil { - return nil, err - } - - skipClient := &http.Client{ - Transport: &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, - }, - } - - return oapi.NewClient(clientConfig, skipClient), nil -} - const testBuilderAccBasic = ` { "builders": [{ @@ -47,7 +27,7 @@ const testBuilderAccBasic = ` "vm_type": "t2.micro", "source_omi": "ami-abe953fa", "ssh_username": "outscale", - "omi_name": "packer-test {{timestamp}}", + "omi_name": "packer-test", "associate_public_ip_address": true, "force_deregister": true }]