From e6cf41e2225e8f13f9fac064287c6e2c70fec094 Mon Sep 17 00:00:00 2001 From: "matthias.gatto" Date: Mon, 17 Jun 2024 15:49:20 +0200 Subject: [PATCH] endpoints: support new endpoint format Signed-off-by: matthias.gatto --- builder/common/access_config.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/builder/common/access_config.go b/builder/common/access_config.go index 560b744..c709f97 100644 --- a/builder/common/access_config.go +++ b/builder/common/access_config.go @@ -8,6 +8,7 @@ import ( "log" "net/http" "os" + "strings" "github.com/hashicorp/packer-plugin-sdk/template/interpolate" oscgo "github.com/outscale/osc-sdk-go/v2" @@ -136,9 +137,13 @@ func (c *AccessConfig) NewOSCClientByRegion(region string) *OscClient { SecretKey: c.SecretKey, }) config.HTTPClient = skipClient + url := fmt.Sprintf("https://api.%s.%s", region, c.CustomEndpointOAPI) + if strings.HasPrefix(c.CustomEndpointOAPI, "http://") || strings.HasPrefix(c.CustomEndpointOAPI, "https://") { + url = fmt.Sprintf("%s/api/v1", c.CustomEndpointOAPI) + } config.Servers = oscgo.ServerConfigurations{ { - URL: fmt.Sprintf("https://api.%s.%s", region, c.CustomEndpointOAPI), + URL: url, Description: "Loaded from profile", Variables: map[string]oscgo.ServerVariable{ "region": {