fastly · Integralist · Jan 17, 2023 · Jan 17, 2023 · Jan 17, 2023 · Jan 17, 2023
@@ -49,6 +49,17 @@ func createDictionaryItemOK(i *fastly.CreateDictionaryItemInput) (*fastly.Dictio
 	}, nil
 }
 
+func createObjectStoreOK(i *fastly.CreateObjectStoreInput) (*fastly.ObjectStore, error) {
+	return &fastly.ObjectStore{
+		ID:   "example-store",
+		Name: i.Name,
+	}, nil
+}
+
+func createObjectStoreItemOK(i *fastly.InsertObjectStoreKeyInput) error {
+	return nil
+}
+
 func getPackageOk(i *fastly.GetPackageInput) (*fastly.Package, error) {
 	return &fastly.Package{ServiceID: i.ServiceID, ServiceVersion: i.ServiceVersion}, nil
 }

@@ -172,6 +172,7 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 		backends     *setup.Backends
 		dictionaries *setup.Dictionaries
 		loggers      *setup.Loggers
+		objectStores *setup.ObjectStores
 	)
 
 	if newService {
@@ -201,6 +202,15 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 			Setup:  c.Manifest.File.Setup.Loggers,
 			Stdout: out,
 		}
+
+		objectStores = &setup.ObjectStores{
+			APIClient:      apiClient,
+			AcceptDefaults: c.Globals.Flag.AcceptDefaults,
+			NonInteractive: c.Globals.Flag.NonInteractive,
+			Setup:          c.Manifest.File.Setup.ObjectStores,
+			Stdin:          in,
+			Stdout:         out,
+		}
 	}
 
 	// RESOURCE CONFIGURATION...
@@ -242,6 +252,14 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 			// significantly between providers.
 			_ = loggers.Configure()
 		}
+
+		if objectStores.Predefined() {
+			err = objectStores.Configure()
+			if err != nil {
+				errLogService(errLog, err, serviceID, serviceVersion.Number)
+				return fmt.Errorf("error configuring service object stores: %w", err)
+			}
+		}
 	}
 
 	text.Break(out)
@@ -279,10 +297,11 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 
 	if newService {
 		// NOTE: We can't pass a text.Progress instance to setup.Backends or
-		// setup.Dictionaries at the point of constructing the setup objects,
+		// setup.Dictionaries (etc) at the point of constructing the setup objects,
 		// as the text.Progress instance prevents other stdout from being read.
 		backends.Progress = progress
 		dictionaries.Progress = progress
+		objectStores.Progress = progress
 
 		if err := backends.Create(); err != nil {
 			errLog.AddWithContext(err, map[string]any{
@@ -305,6 +324,17 @@ func (c *DeployCommand) Exec(in io.Reader, out io.Writer) (err error) {
 			})
 			return err
 		}
+
+		if err := objectStores.Create(); err != nil {
+			errLog.AddWithContext(err, map[string]any{
+				"Accept defaults": c.Globals.Flag.AcceptDefaults,
+				"Auto-yes":        c.Globals.Flag.AutoYes,
+				"Non-interactive": c.Globals.Flag.NonInteractive,
+				"Service ID":      serviceID,
+				"Service Version": serviceVersion.Number,
+			})
+			return err
+		}
 	}
 
 	// PACKAGE PROCESSING...
@@ -450,7 +480,7 @@ func validatePackage(
 
 	hashSum, err = getHashSum(contents)
 	if err != nil {
-		return pkgPath, hashSum, err
+		return pkgPath, "", err
 	}
 
 	return pkgPath, hashSum, nil

@@ -1266,6 +1266,188 @@ func TestDeploy(t *testing.T) {
 				"SUCCESS: Deployed package (service 12345, version 1)",
 			},
 		},
+		// NOTE: The following test validates [setup] only works for a new service.
+		{
+			name: "success with setup.object_stores configuration and existing service",
+			args: args("compute deploy --service-id 123 --token 123"),
+			api: mock.API{
+				ActivateVersionFn:   activateVersionOk,
+				CloneVersionFn:      testutil.CloneVersionResult(4),
+				CreateBackendFn:     createBackendOK,
+				GetPackageFn:        getPackageOk,
+				GetServiceFn:        getServiceOK,
+				GetServiceDetailsFn: getServiceDetailsWasm,
+				ListDomainsFn:       listDomainsOk,
+				ListVersionsFn:      testutil.ListVersions,
+				UpdatePackageFn:     updatePackageOk,
+			},
+			manifest: `
+			name = "package"
+			manifest_version = 2
+			language = "rust"
+
+			[setup.object_stores.store_one]
+			description = "My first object store"
+			[setup.object_stores.store_one.items.foo]
+			value = "my default value for foo"
+			description = "a good description about foo"
+			[setup.object_stores.store_one.items.bar]
+			value = "my default value for bar"
+			description = "a good description about bar"
+			`,
+			wantOutput: []string{
+				"Uploading package...",
+				"Activating version...",
+				"SUCCESS: Deployed package (service 123, version 4)",
+			},
+			dontWantOutput: []string{
+				"Configuring object store 'store_one'",
+				"Create an object store key called 'foo'",
+				"Create an object store key called 'bar'",
+				"Creating object store 'store_one'...",
+				"Creating object store key 'foo'...",
+				"Creating object store key 'bar'...",
+			},
+		},
+		{
+			name: "success with setup.object_stores configuration and no existing service",
+			args: args("compute deploy --token 123"),
+			api: mock.API{
+				ActivateVersionFn:      activateVersionOk,
+				CreateBackendFn:        createBackendOK,
+				CreateObjectStoreFn:    createObjectStoreOK,
+				InsertObjectStoreKeyFn: createObjectStoreItemOK,
+				CreateDomainFn:         createDomainOK,
+				CreateServiceFn:        createServiceOK,
+				GetPackageFn:           getPackageOk,
+				GetServiceFn:           getServiceOK,
+				GetServiceDetailsFn:    getServiceDetailsWasm,
+				ListDomainsFn:          listDomainsOk,
+				ListVersionsFn:         testutil.ListVersions,
+				UpdatePackageFn:        updatePackageOk,
+			},
+			manifest: `
+			name = "package"
+			manifest_version = 2
+			language = "rust"
+
+			[setup.object_stores.store_one]
+			description = "My first object store"
+			[setup.object_stores.store_one.items.foo]
+			value = "my default value for foo"
+			description = "a good description about foo"
+			[setup.object_stores.store_one.items.bar]
+			value = "my default value for bar"
+			description = "a good description about bar"
+			`,
+			stdin: []string{
+				"Y", // when prompted to create a new service
+			},
+			wantOutput: []string{
+				"Configuring object store 'store_one'",
+				"Create an object store key called 'foo'",
+				"Create an object store key called 'bar'",
+				"Creating object store 'store_one'...",
+				"Creating object store key 'foo'...",
+				"Creating object store key 'bar'...",
+				"Uploading package...",
+				"Activating version...",
+				"SUCCESS: Deployed package (service 12345, version 1)",
+			},
+		},
+		{
+			name: "success with setup.object_stores configuration and no existing service and --non-interactive",
+			args: args("compute deploy --non-interactive --token 123"),
+			api: mock.API{
+				ActivateVersionFn:      activateVersionOk,
+				CreateBackendFn:        createBackendOK,
+				CreateObjectStoreFn:    createObjectStoreOK,
+				InsertObjectStoreKeyFn: createObjectStoreItemOK,
+				CreateDomainFn:         createDomainOK,
+				CreateServiceFn:        createServiceOK,
+				GetPackageFn:           getPackageOk,
+				GetServiceFn:           getServiceOK,
+				GetServiceDetailsFn:    getServiceDetailsWasm,
+				ListDomainsFn:          listDomainsOk,
+				ListVersionsFn:         testutil.ListVersions,
+				UpdatePackageFn:        updatePackageOk,
+			},
+			manifest: `
+			name = "package"
+			manifest_version = 2
+			language = "rust"
+
+			[setup.object_stores.store_one]
+			description = "My first object store"
+			[setup.object_stores.store_one.items.foo]
+			value = "my default value for foo"
+			description = "a good description about foo"
+			[setup.object_stores.store_one.items.bar]
+			value = "my default value for bar"
+			description = "a good description about bar"
+			`,
+			stdin: []string{
+				"Y", // when prompted to create a new service
+			},
+			wantOutput: []string{
+				"Creating object store 'store_one'...",
+				"Creating object store key 'foo'...",
+				"Creating object store key 'bar'...",
+				"Uploading package...",
+				"Activating version...",
+				"SUCCESS: Deployed package (service 12345, version 1)",
+			},
+		},
+		{
+			name: "success with setup.object_stores configuration and no existing service and no predefined values",
+			args: args("compute deploy --token 123"),
+			api: mock.API{
+				ActivateVersionFn:      activateVersionOk,
+				CreateBackendFn:        createBackendOK,
+				CreateObjectStoreFn:    createObjectStoreOK,
+				InsertObjectStoreKeyFn: createObjectStoreItemOK,
+				CreateDomainFn:         createDomainOK,
+				CreateServiceFn:        createServiceOK,
+				GetPackageFn:           getPackageOk,
+				GetServiceFn:           getServiceOK,
+				GetServiceDetailsFn:    getServiceDetailsWasm,
+				ListDomainsFn:          listDomainsOk,
+				ListVersionsFn:         testutil.ListVersions,
+				UpdatePackageFn:        updatePackageOk,
+			},
+			manifest: `
+			name = "package"
+			manifest_version = 2
+			language = "rust"
+
+			[setup.object_stores.store_one]
+			[setup.object_stores.store_one.items.foo]
+			[setup.object_stores.store_one.items.bar]
+			`,
+			stdin: []string{
+				"Y", // when prompted to create a new service
+			},
+			wantOutput: []string{
+				"Configuring object store 'store_one'",
+				"Create an object store key called 'foo'",
+				"Create an object store key called 'bar'",
+				"Creating object store 'store_one'...",
+				"Creating object store key 'foo'...",
+				"Creating object store key 'bar'...",
+				"Uploading package...",
+				"Activating version...",
+				"SUCCESS: Deployed package (service 12345, version 1)",
+			},
+			// The following are predefined values for the `description` and `value`
+			// fields from the prior setup.dictionaries tests that we expect to not
+			// be present in the stdout/stderr as the [setup/dictionaries]
+			// configuration does not define them.
+			dontWantOutput: []string{
+				"My first object store",
+				"my default value for foo",
+				"my default value for bar",
+			},
+		},
 	}
 	for testcaseIdx := range scenarios {
 		testcase := &scenarios[testcaseIdx]