Add 'force-path-style' to AnalyticsBlobStorage settings

This needs to be set to true on the latest Analytics builds

Author: willbroadbelt

clusterdef/cluster.go

@@ -37,12 +37,13 @@ type AnalyticsSettings struct {
 }
 
 type AnalyticsBlobStorageSettings struct {
-	Region        string `yaml:"region,omitempty"`
-	Prefix        string `yaml:"prefix,omitempty"`
-	Bucket        string `yaml:"bucket,omitempty"`
-	Scheme        string `yaml:"scheme,omitempty"`
-	Endpoint      string `yaml:"endpoint,omitempty"`
-	AnonymousAuth bool   `yaml:"anonymous-auth,omitempty"`
+	Region         string `yaml:"region,omitempty"`
+	Prefix         string `yaml:"prefix,omitempty"`
+	Bucket         string `yaml:"bucket,omitempty"`
+	Scheme         string `yaml:"scheme,omitempty"`
+	Endpoint       string `yaml:"endpoint,omitempty"`
+	AnonymousAuth  bool   `yaml:"anonymous-auth,omitempty"`
+	ForcePathStyle bool   `yaml:"force-path-style,omitempty"`
 }
 
 type CaoCluster struct {

deployment/dockerdeploy/deployer.go

@@ -360,11 +360,12 @@ func (d *Deployer) NewCluster(ctx context.Context, def *clusterdef.Cluster) (dep
 		d.logger.Info("s3 mock is ready")
 
 		def.Docker.Analytics.BlobStorage = clusterdef.AnalyticsBlobStorageSettings{
-			Region:        "local",
-			Bucket:        "columnar",
-			Scheme:        "s3",
-			Endpoint:      fmt.Sprintf("http://%s:9090", node.IPAddress),
-			AnonymousAuth: true,
+			Region:         "local",
+			Bucket:         "columnar",
+			Scheme:         "s3",
+			Endpoint:       fmt.Sprintf("http://%s:9090", node.IPAddress),
+			AnonymousAuth:  true,
+			ForcePathStyle: true,
 		}
 	}
 
@@ -659,12 +660,13 @@ func (d *Deployer) NewCluster(ctx context.Context, def *clusterdef.Cluster) (dep
 	}
 
 	analyticsSettings := clustercontrol.AnalyticsSettings{
-		BlobStorageRegion:        def.Docker.Analytics.BlobStorage.Region,
-		BlobStoragePrefix:        def.Docker.Analytics.BlobStorage.Prefix,
-		BlobStorageBucket:        def.Docker.Analytics.BlobStorage.Bucket,
-		BlobStorageScheme:        def.Docker.Analytics.BlobStorage.Scheme,
-		BlobStorageEndpoint:      def.Docker.Analytics.BlobStorage.Endpoint,
-		BlobStorageAnonymousAuth: def.Docker.Analytics.BlobStorage.AnonymousAuth,
+		BlobStorageRegion:         def.Docker.Analytics.BlobStorage.Region,
+		BlobStoragePrefix:         def.Docker.Analytics.BlobStorage.Prefix,
+		BlobStorageBucket:         def.Docker.Analytics.BlobStorage.Bucket,
+		BlobStorageScheme:         def.Docker.Analytics.BlobStorage.Scheme,
+		BlobStorageEndpoint:       def.Docker.Analytics.BlobStorage.Endpoint,
+		BlobStorageAnonymousAuth:  def.Docker.Analytics.BlobStorage.AnonymousAuth,
+		BlobStorageForcePathStyle: def.Docker.Analytics.BlobStorage.ForcePathStyle,
 	}
 	d.logger.Debug("analytics configuration", zap.Any("settings", analyticsSettings))
 

utils/clustercontrol/controller.go

@@ -302,12 +302,13 @@ func (c *Controller) UpdateWebSettings(ctx context.Context, opts *UpdateWebSetti
 }
 
 type SetupAnalyticsOptions struct {
-	BlobStorageRegion        string
-	BlobStoragePrefix        string
-	BlobStorageBucket        string
-	BlobStorageScheme        string
-	BlobStorageEndpoint      string
-	BlobStorageAnonymousAuth bool
+	BlobStorageRegion         string
+	BlobStoragePrefix         string
+	BlobStorageBucket         string
+	BlobStorageScheme         string
+	BlobStorageEndpoint       string
+	BlobStorageAnonymousAuth  bool
+	BlobStorageForcePathStyle bool
 }
 
 func (c *Controller) SetupAnalytics(ctx context.Context, opts *SetupAnalyticsOptions) error {
@@ -316,7 +317,8 @@ func (c *Controller) SetupAnalytics(ctx context.Context, opts *SetupAnalyticsOpt
 		opts.BlobStorageRegion == "" &&
 		opts.BlobStorageScheme == "" &&
 		opts.BlobStorageEndpoint == "" &&
-		!opts.BlobStorageAnonymousAuth {
+		!opts.BlobStorageAnonymousAuth &&
+		!opts.BlobStorageForcePathStyle {
 		return nil
 	}
 
@@ -330,6 +332,9 @@ func (c *Controller) SetupAnalytics(ctx context.Context, opts *SetupAnalyticsOpt
 	if opts.BlobStorageAnonymousAuth {
 		form.Add("blobStorageAnonymousAuth", "true")
 	}
+	if opts.BlobStorageForcePathStyle {
+		form.Add("blobStorageForcePathStyle", "true")
+	}
 	return c.doFormPost(ctx, "/settings/analytics", form, true, nil)
 }
 

utils/clustercontrol/nodemanager.go

@@ -39,12 +39,13 @@ func (m *NodeManager) WaitForOnline(ctx context.Context) error {
 }
 
 type AnalyticsSettings struct {
-	BlobStorageRegion        string
-	BlobStoragePrefix        string
-	BlobStorageBucket        string
-	BlobStorageScheme        string
-	BlobStorageEndpoint      string
-	BlobStorageAnonymousAuth bool
+	BlobStorageRegion         string
+	BlobStoragePrefix         string
+	BlobStorageBucket         string
+	BlobStorageScheme         string
+	BlobStorageEndpoint       string
+	BlobStorageAnonymousAuth  bool
+	BlobStorageForcePathStyle bool
 }
 
 type SetupOneNodeClusterOptions struct {
@@ -57,8 +58,8 @@ type SetupOneNodeClusterOptions struct {
 	Username string
 	Password string
 
-	Services    []string
-	ServerGroup string
+	Services          []string
+	ServerGroup       string
 	AnalyticsSettings AnalyticsSettings
 }
 
@@ -91,12 +92,13 @@ func (m *NodeManager) SetupOneNodeCluster(ctx context.Context, opts *SetupOneNod
 	}
 
 	err = c.SetupAnalytics(ctx, &SetupAnalyticsOptions{
-		BlobStorageRegion:        opts.AnalyticsSettings.BlobStorageRegion,
-		BlobStoragePrefix:        opts.AnalyticsSettings.BlobStoragePrefix,
-		BlobStorageBucket:        opts.AnalyticsSettings.BlobStorageBucket,
-		BlobStorageScheme:        opts.AnalyticsSettings.BlobStorageScheme,
-		BlobStorageEndpoint:      opts.AnalyticsSettings.BlobStorageEndpoint,
-		BlobStorageAnonymousAuth: opts.AnalyticsSettings.BlobStorageAnonymousAuth,
+		BlobStorageRegion:         opts.AnalyticsSettings.BlobStorageRegion,
+		BlobStoragePrefix:         opts.AnalyticsSettings.BlobStoragePrefix,
+		BlobStorageBucket:         opts.AnalyticsSettings.BlobStorageBucket,
+		BlobStorageScheme:         opts.AnalyticsSettings.BlobStorageScheme,
+		BlobStorageEndpoint:       opts.AnalyticsSettings.BlobStorageEndpoint,
+		BlobStorageAnonymousAuth:  opts.AnalyticsSettings.BlobStorageAnonymousAuth,
+		BlobStorageForcePathStyle: opts.AnalyticsSettings.BlobStorageForcePathStyle,
 	})
 	if err != nil {
 		return errors.Wrap(err, "failed to configure analytics settings")