SCALRCORE-21151 fix resource naming [API_BRANCH] [DB_BRANCH]

workspace.go

@@ -61,7 +61,7 @@ type Workspace struct {
 	WorkingDirectory     string                `jsonapi:"attr,working-directory"`
 	HasResources         bool                  `jsonapi:"attr,has-resources"`
 	Hooks                *Hooks                `jsonapi:"attr,hooks"`
-	RunOperationsTimeout *int                  `jsonapi:"attr,run-operations-timeout"`
+	RunOperationTimeout  *int                  `jsonapi:"attr,run-operation-timeout"`
 
 	// Relations
 	CurrentRun    *Run           `jsonapi:"relation,current-run"`
@@ -182,7 +182,7 @@ type WorkspaceCreateOptions struct {
 	ModuleVersion *ModuleVersion `jsonapi:"relation,module-version,omitempty"`
 
 	// Specifies the number of minutes run operation can be executed before termination.
-	RunOperationsTimeout *int `jsonapi:"attr,run-operations-timeout"`
+	RunOperationTimeout *int `jsonapi:"attr,run-operation-timeout"`
 }
 
 // WorkspaceVCSRepoOptions represents the configuration options of a VCS integration.
@@ -342,7 +342,7 @@ type WorkspaceUpdateOptions struct {
 	ModuleVersion *ModuleVersion `jsonapi:"relation,module-version"`
 
 	// Specifies the number of minutes run operation can be executed before termination.
-	RunOperationsTimeout *int `jsonapi:"attr,run-operations-timeout"`
+	RunOperationTimeout *int `jsonapi:"attr,run-operation-timeout"`
 }
 
 // Update settings of an existing workspace.

workspace_test.go

@@ -69,13 +69,13 @@ func TestWorkspacesCreate(t *testing.T) {
 
 	t.Run("with valid options", func(t *testing.T) {
 		options := WorkspaceCreateOptions{
-			Environment:          envTest,
-			Name:                 String(randomString(t)),
-			AutoApply:            Bool(true),
-			Operations:           Bool(true),
-			TerraformVersion:     String("0.12.25"),
-			WorkingDirectory:     String("bar/"),
-			RunOperationsTimeout: Int(15),
+			Environment:         envTest,
+			Name:                String(randomString(t)),
+			AutoApply:           Bool(true),
+			Operations:          Bool(true),
+			TerraformVersion:    String("0.12.25"),
+			WorkingDirectory:    String("bar/"),
+			RunOperationTimeout: Int(15),
 		}
 
 		ws, err := client.Workspaces.Create(ctx, options)
@@ -96,7 +96,7 @@ func TestWorkspacesCreate(t *testing.T) {
 			assert.Equal(t, *options.Operations, item.Operations)
 			assert.Equal(t, *options.TerraformVersion, item.TerraformVersion)
 			assert.Equal(t, *options.WorkingDirectory, item.WorkingDirectory)
-			assert.Equal(t, options.RunOperationsTimeout, item.RunOperationsTimeout)
+			assert.Equal(t, options.RunOperationTimeout, item.RunOperationTimeout)
 		}
 	})
 
@@ -265,11 +265,11 @@ func TestWorkspacesUpdate(t *testing.T) {
 
 	t.Run("when updating a subset of values", func(t *testing.T) {
 		options := WorkspaceUpdateOptions{
-			Name:                 String(wsTest.Name),
-			AutoApply:            Bool(true),
-			Operations:           Bool(true),
-			TerraformVersion:     String("0.12.25"),
-			RunOperationsTimeout: Int(20),
+			Name:                String(wsTest.Name),
+			AutoApply:           Bool(true),
+			Operations:          Bool(true),
+			TerraformVersion:    String("0.12.25"),
+			RunOperationTimeout: Int(20),
 		}
 
 		wsAfter, err := client.Workspaces.Update(ctx, wsTest.ID, options)
@@ -279,7 +279,7 @@ func TestWorkspacesUpdate(t *testing.T) {
 		assert.NotEqual(t, wsTest.AutoApply, wsAfter.AutoApply)
 		assert.NotEqual(t, wsTest.TerraformVersion, wsAfter.TerraformVersion)
 		assert.Equal(t, wsTest.WorkingDirectory, wsAfter.WorkingDirectory)
-		assert.Equal(t, int(20), *wsAfter.RunOperationsTimeout)
+		assert.Equal(t, int(20), *wsAfter.RunOperationTimeout)
 	})
 
 	t.Run("when attaching/detaching an agent pool", func(t *testing.T) {