Revert "Revert "Provider > Add link API between on-prem VCS and Agent…

…-Pool ""

access_token_test.go

@@ -13,7 +13,7 @@ func TestAccessTokenRead(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	ap, apCleanup := createAgentPool(t, client)
+	ap, apCleanup := createAgentPool(t, client, false)
 	defer apCleanup()
 
 	atTest, atTestCleanup := createAgentPoolToken(t, client, ap.ID)
@@ -40,7 +40,7 @@ func TestAccessTokenUpdate(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	ap, apCleanup := createAgentPool(t, client)
+	ap, apCleanup := createAgentPool(t, client, false)
 	defer apCleanup()
 
 	apt, aptCleanup := createAgentPoolToken(t, client, ap.ID)
@@ -75,7 +75,7 @@ func TestAccessTokenDelete(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	ap, apCleanup := createAgentPool(t, client)
+	ap, apCleanup := createAgentPool(t, client, false)
 	defer apCleanup()
 
 	apt, _ := createAgentPoolToken(t, client, ap.ID)

agent_pool.go

@@ -34,9 +34,9 @@ type AgentPoolList struct {
 
 // AgentPool represents a Scalr agent pool.
 type AgentPool struct {
-	ID   string `jsonapi:"primary,agent-pools"`
-	Name string `jsonapi:"attr,name"`
-
+	ID         string `jsonapi:"primary,agent-pools"`
+	Name       string `jsonapi:"attr,name"`
+	VcsEnabled bool   `jsonapi:"attr,vcs-enabled"`
 	// Relations
 
 	// The agent pool's scope
@@ -51,8 +51,9 @@ type AgentPool struct {
 
 // AgentPoolCreateOptions represents the options for creating a new AgentPool.
 type AgentPoolCreateOptions struct {
-	ID   string  `jsonapi:"primary,agent-pools"`
-	Name *string `jsonapi:"attr,name"`
+	ID         string  `jsonapi:"primary,agent-pools"`
+	Name       *string `jsonapi:"attr,name"`
+	VcsEnabled *bool   `jsonapi:"attr,vcs-enabled,omitempty"`
 
 	// The agent pool's scope
 	Account     *Account     `jsonapi:"relation,account"`
@@ -96,6 +97,7 @@ type AgentPoolListOptions struct {
 	Environment *string `url:"filter[environment],omitempty"`
 	Name        string  `url:"filter[name],omitempty"`
 	AgentPool   string  `url:"filter[agent-pool],omitempty"`
+	VcsEnabled  *bool   `url:"filter[vcs-enabled],omitempty"`
 	Include     string  `url:"include,omitempty"`
 }
 

agent_pool_test.go

@@ -13,10 +13,12 @@ func TestAgentPoolsList(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	agentPoolTest1, agentPoolTest1Cleanup := createAgentPool(t, client)
+	agentPoolTest1, agentPoolTest1Cleanup := createAgentPool(t, client, false)
 	defer agentPoolTest1Cleanup()
-	agentPoolTest2, agentPoolTest2Cleanup := createAgentPool(t, client)
+	agentPoolTest2, agentPoolTest2Cleanup := createAgentPool(t, client, true)
 	defer agentPoolTest2Cleanup()
+	agentPoolTest3, agentPoolTest3Cleanup := createAgentPool(t, client, true)
+	defer agentPoolTest3Cleanup()
 
 	t.Run("without options", func(t *testing.T) {
 		apList, err := client.AgentPools.List(ctx, AgentPoolListOptions{})
@@ -27,6 +29,7 @@ func TestAgentPoolsList(t *testing.T) {
 		}
 		assert.Contains(t, apListIDs, agentPoolTest1.ID)
 		assert.Contains(t, apListIDs, agentPoolTest2.ID)
+		assert.Contains(t, apListIDs, agentPoolTest3.ID)
 	})
 	t.Run("with account filter", func(t *testing.T) {
 		apList, err := client.AgentPools.List(ctx, AgentPoolListOptions{Account: String(defaultAccountID)})
@@ -37,6 +40,7 @@ func TestAgentPoolsList(t *testing.T) {
 		}
 		assert.Contains(t, apListIDs, agentPoolTest1.ID)
 		assert.Contains(t, apListIDs, agentPoolTest2.ID)
+		assert.Contains(t, apListIDs, agentPoolTest3.ID)
 	})
 	t.Run("with account and name filter", func(t *testing.T) {
 		apList, err := client.AgentPools.List(ctx, AgentPoolListOptions{Account: String(defaultAccountID), Name: agentPoolTest1.Name})
@@ -50,6 +54,18 @@ func TestAgentPoolsList(t *testing.T) {
 		assert.Len(t, apList.Items, 1)
 		assert.Equal(t, apList.Items[0].ID, agentPoolTest2.ID)
 	})
+	t.Run("with vcs-enabled filter", func(t *testing.T) {
+		var vcsEnabledFiler = true
+		apList, err := client.AgentPools.List(ctx, AgentPoolListOptions{VcsEnabled: &vcsEnabledFiler})
+		require.NoError(t, err)
+		apListIDs := make([]string, 0)
+		for _, agentPool := range apList.Items {
+			apListIDs = append(apListIDs, agentPool.ID)
+		}
+		assert.Len(t, apListIDs, 2)
+		assert.Contains(t, apListIDs, agentPoolTest2.ID)
+		assert.Contains(t, apListIDs, agentPoolTest3.ID)
+	})
 }
 
 func TestAgentPoolsCreate(t *testing.T) {
@@ -58,8 +74,9 @@ func TestAgentPoolsCreate(t *testing.T) {
 
 	t.Run("when account and name are provided", func(t *testing.T) {
 		options := AgentPoolCreateOptions{
-			Account: &Account{ID: defaultAccountID},
-			Name:    String("test-provider-pool-" + randomString(t)),
+			Account:    &Account{ID: defaultAccountID},
+			Name:       String("test-provider-pool-" + randomString(t)),
+			VcsEnabled: Bool(true),
 		}
 
 		agentPool, err := client.AgentPools.Create(ctx, options)
@@ -76,6 +93,31 @@ func TestAgentPoolsCreate(t *testing.T) {
 			assert.NotEmpty(t, item.ID)
 			assert.Equal(t, *options.Name, item.Name)
 			assert.Equal(t, options.Account, item.Account)
+			assert.Equal(t, *options.VcsEnabled, item.VcsEnabled)
+		}
+		err = client.AgentPools.Delete(ctx, agentPool.ID)
+		require.NoError(t, err)
+	})
+
+	t.Run("when create without vcs_enabled", func(t *testing.T) {
+		options := AgentPoolCreateOptions{
+			Account: &Account{ID: defaultAccountID},
+			Name:    String("test-provider-pool-" + randomString(t)),
+		}
+
+		agentPool, err := client.AgentPools.Create(ctx, options)
+		require.NoError(t, err)
+
+		// Get a refreshed view from the API.
+		refreshed, err := client.AgentPools.Read(ctx, agentPool.ID)
+		require.NoError(t, err)
+
+		for _, item := range []*AgentPool{
+			agentPool,
+			refreshed,
+		} {
+			assert.NotEmpty(t, item.ID)
+			assert.Equal(t, item.VcsEnabled, false)
 		}
 		err = client.AgentPools.Delete(ctx, agentPool.ID)
 		require.NoError(t, err)
@@ -90,6 +132,7 @@ func TestAgentPoolsCreate(t *testing.T) {
 			Account:     &Account{ID: defaultAccountID},
 			Environment: &Environment{ID: env.ID},
 			Name:        String("test-provider-pool-" + randomString(t)),
+			VcsEnabled:  Bool(false),
 		}
 
 		agentPool, err := client.AgentPools.Create(ctx, options)
@@ -123,6 +166,7 @@ func TestAgentPoolsCreate(t *testing.T) {
 			Environment: &Environment{ID: env.ID},
 			Workspaces:  []*Workspace{{ID: ws.ID}},
 			Name:        String("test-provider-pool-" + randomString(t)),
+			VcsEnabled:  Bool(false),
 		}
 
 		agentPool, err := client.AgentPools.Create(ctx, options)
@@ -241,7 +285,7 @@ func TestAgentPoolsRead(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	agentPoolTest, agentPoolTestCleanup := createAgentPool(t, client)
+	agentPoolTest, agentPoolTestCleanup := createAgentPool(t, client, false)
 	defer agentPoolTestCleanup()
 
 	t.Run("when the agentPool exists", func(t *testing.T) {
@@ -278,7 +322,7 @@ func TestAgentPoolsUpdate(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	agentPoolTest, agentPoolTestCleanup := createAgentPool(t, client)
+	agentPoolTest, agentPoolTestCleanup := createAgentPool(t, client, false)
 	defer agentPoolTestCleanup()
 
 	t.Run("when updating a name", func(t *testing.T) {
@@ -337,7 +381,7 @@ func TestAgentPoolsDelete(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	pool, _ := createAgentPool(t, client)
+	pool, _ := createAgentPool(t, client, false)
 
 	t.Run("with valid agent pool id", func(t *testing.T) {
 		err := client.AgentPools.Delete(ctx, pool.ID)

agent_pool_token_test.go

@@ -13,7 +13,7 @@ func TestAgentPoolTokenList(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	ap, apCleanup := createAgentPool(t, client)
+	ap, apCleanup := createAgentPool(t, client, false)
 	defer apCleanup()
 
 	apt, aptCleanup := createAgentPoolToken(t, client, ap.ID)
@@ -41,7 +41,7 @@ func TestAgentPoolTokenCreate(t *testing.T) {
 	client := testClient(t)
 	ctx := context.Background()
 
-	ap, apCleanup := createAgentPool(t, client)
+	ap, apCleanup := createAgentPool(t, client, false)
 	defer apCleanup()
 
 	t.Run("when description is provided", func(t *testing.T) {

helper_test.go

@@ -44,11 +44,12 @@ func createEnvironment(t *testing.T, client *Client) (*Environment, func()) {
 	}
 }
 
-func createAgentPool(t *testing.T, client *Client) (*AgentPool, func()) {
+func createAgentPool(t *testing.T, client *Client, vcsEnabled bool) (*AgentPool, func()) {
 	ctx := context.Background()
 	ap, err := client.AgentPools.Create(ctx, AgentPoolCreateOptions{
-		Name:    String("provider-tst-pool-" + randomString(t)),
-		Account: &Account{ID: defaultAccountID},
+		Name:       String("provider-tst-pool-" + randomString(t)),
+		Account:    &Account{ID: defaultAccountID},
+		VcsEnabled: Bool(vcsEnabled),
 	})
 	if err != nil {
 		t.Fatal(err)

run_triggers_test.go

@@ -88,14 +88,16 @@ func TestRunTriggersRead(t *testing.T) {
 		Downstream: &Downstream{ID: wsTest1.ID},
 		Upstream:   &Upstream{ID: wsTest2.ID},
 	}
-	created_trigger, err := client.RunTriggers.Create(ctx, options)
+	createdTrigger, err := client.RunTriggers.Create(ctx, options)
 	require.NoError(t, err)
-	assert.NotEmpty(t, created_trigger.ID)
+	assert.NotEmpty(t, createdTrigger.ID)
 
 	t.Run("get run trigger by id", func(t *testing.T) {
-		trigger, err := client.RunTriggers.Read(ctx, created_trigger.ID)
+		trigger, err := client.RunTriggers.Read(ctx, createdTrigger.ID)
 		require.NoError(t, err)
-		assert.Equal(t, created_trigger, trigger)
+		assert.Equal(t, createdTrigger.ID, trigger.ID)
+		assert.Equal(t, createdTrigger.Upstream.ID, trigger.Upstream.ID)
+		assert.Equal(t, createdTrigger.Downstream.ID, trigger.Downstream.ID)
 	})
 
 	t.Run("try to get run trigger with not valid ID", func(t *testing.T) {

vcs_provider.go

@@ -75,6 +75,7 @@ type VcsProvider struct {
 	// Relations
 	Environments []*Environment `jsonapi:"relation,environments"`
 	Account      *Account       `jsonapi:"relation,account"`
+	AgentPool    *AgentPool     `jsonapi:"relation,agent-pool"`
 }
 
 // VcsProvidersListOptions represents the options for listing vcs providers.
@@ -96,6 +97,7 @@ type VcsProvidersListOptions struct {
 	// Scope filters.
 	Environment *string `url:"filter[environment],omitempty"`
 	Account     *string `url:"filter[account],omitempty"`
+	AgentPool   *string `url:"filter[agent-pool],omitempty"`
 }
 
 // List the vcs providers.
@@ -128,6 +130,7 @@ type VcsProviderCreateOptions struct {
 	// Relations
 	Environments []*Environment `jsonapi:"relation,environments,omitempty"`
 	Account      *Account       `jsonapi:"relation,account,omitempty"`
+	AgentPool    *AgentPool     `jsonapi:"relation,agent-pool,omitempty"`
 }
 
 // Create is used to create a new vcs provider.
@@ -178,6 +181,9 @@ type VcsProviderUpdateOptions struct {
 	Token    *string `jsonapi:"attr,token,omitempty"`
 	Url      *string `jsonapi:"attr,url,omitempty"`
 	Username *string `jsonapi:"attr,username,omitempty"`
+
+	// Relations
+	AgentPool *AgentPool `jsonapi:"relation,agent-pool"`
 }
 
 // Update settings of an existing vcs provider.

vcs_provider_test.go

@@ -68,7 +68,7 @@ func TestVcsProvidersCreate(t *testing.T) {
 
 	t.Run("with valid options", func(t *testing.T) {
 		options := VcsProviderCreateOptions{
-			Name:     String("foo"),
+			Name:     String("vcs-" + randomString(t)),
 			VcsType:  Github,
 			AuthType: PersonalToken,
 			Token:    os.Getenv("GITHUB_TOKEN"),
@@ -95,6 +95,25 @@ func TestVcsProvidersCreate(t *testing.T) {
 		}
 	})
 
+	t.Run("with agent-pool attr vcs-enabled: false", func(t *testing.T) {
+		ap, apCleanup := createAgentPool(t, client, false)
+		defer apCleanup()
+
+		options := VcsProviderCreateOptions{
+			Name:     String("vcs-" + randomString(t)),
+			VcsType:  Github,
+			AuthType: PersonalToken,
+			Token:    os.Getenv("GITHUB_TOKEN"),
+
+			Environments: []*Environment{envTest},
+			Account:      &Account{ID: defaultAccountID},
+			AgentPool:    ap,
+		}
+
+		_, err := client.VcsProviders.Create(ctx, options)
+		require.Error(t, err)
+	})
+
 	t.Run("when options has an invalid environment", func(t *testing.T) {
 		_, err := client.VcsProviders.Create(ctx, VcsProviderCreateOptions{
 			Name:         String("test-vcs"),

workspace_test.go

@@ -74,7 +74,7 @@ func TestWorkspacesCreate(t *testing.T) {
 	envTest, envTestCleanup := createEnvironment(t, client)
 	defer envTestCleanup()
 
-	pool, poolCleanup := createAgentPool(t, client)
+	pool, poolCleanup := createAgentPool(t, client, false)
 	defer poolCleanup()
 
 	t.Run("with valid options", func(t *testing.T) {
@@ -272,7 +272,7 @@ func TestWorkspacesUpdate(t *testing.T) {
 	envTest, envTestCleanup := createEnvironment(t, client)
 	defer envTestCleanup()
 
-	pool, poolCleanup := createAgentPool(t, client)
+	pool, poolCleanup := createAgentPool(t, client, false)
 	defer poolCleanup()
 
 	wsTest, _ := createWorkspace(t, client, envTest)