Use context when querying GitLab version

Author: timofurrer

internal/provider/resource_gitlab_managed_license_test.go

@@ -1,6 +1,7 @@
 package provider
 
 import (
+	"context"
 	"fmt"
 	"strconv"
 	"testing"
@@ -60,7 +61,7 @@ func TestAccGitlabManagedLicense_deprecatedConfigValues(t *testing.T) {
 				// Create a managed license with an "approved" state
 				SkipFunc: orSkipFunc(
 					isRunningInCE,
-					isGitLabVersionLessThan(testGitlabClient, "15.0"),
+					isGitLabVersionLessThan(context.Background(), testGitlabClient, "15.0"),
 				),
 				Config: testManagedLicenseConfig(rInt, "approved"),
 				Check: resource.ComposeTestCheckFunc(
@@ -71,7 +72,7 @@ func TestAccGitlabManagedLicense_deprecatedConfigValues(t *testing.T) {
 				// Update the managed license to have a blacklisted state
 				SkipFunc: orSkipFunc(
 					isRunningInCE,
-					isGitLabVersionLessThan(testGitlabClient, "15.0"),
+					isGitLabVersionLessThan(context.Background(), testGitlabClient, "15.0"),
 				),
 				Config: testManagedLicenseConfig(rInt, "blacklisted"),
 				Check: resource.ComposeTestCheckFunc(
@@ -81,7 +82,7 @@ func TestAccGitlabManagedLicense_deprecatedConfigValues(t *testing.T) {
 			{
 				SkipFunc: orSkipFunc(
 					isRunningInCE,
-					isGitLabVersionLessThan(testGitlabClient, "15.0"),
+					isGitLabVersionLessThan(context.Background(), testGitlabClient, "15.0"),
 				),
 				ResourceName:      "gitlab_managed_license.fixme",
 				ImportState:       true,

internal/provider/resource_gitlab_project.go

@@ -663,7 +663,7 @@ A project can either be created in a group or user namespace.
 	}
 })
 
-func resourceGitlabProjectSetToState(client *gitlab.Client, d *schema.ResourceData, project *gitlab.Project) error {
+func resourceGitlabProjectSetToState(ctx context.Context, client *gitlab.Client, d *schema.ResourceData, project *gitlab.Project) error {
 	d.SetId(fmt.Sprintf("%d", project.ID))
 	d.Set("name", project.Name)
 	d.Set("path", project.Path)
@@ -694,7 +694,7 @@ func resourceGitlabProjectSetToState(client *gitlab.Client, d *schema.ResourceDa
 		return err
 	}
 	d.Set("archived", project.Archived)
-	if supportsSquashOption, err := isGitLabVersionAtLeast(client, "14.1")(); err != nil {
+	if supportsSquashOption, err := isGitLabVersionAtLeast(ctx, client, "14.1")(); err != nil {
 		return err
 	} else if supportsSquashOption {
 		d.Set("squash_option", project.SquashOption)
@@ -938,7 +938,7 @@ func resourceGitlabProjectCreate(ctx context.Context, d *schema.ResourceData, me
 		options.MergeCommitTemplate = gitlab.String(v.(string))
 	}
 
-	if supportsSquashOption, err := isGitLabVersionAtLeast(client, "14.1")(); err != nil {
+	if supportsSquashOption, err := isGitLabVersionAtLeast(ctx, client, "14.1")(); err != nil {
 		return diag.FromErr(err)
 	} else if supportsSquashOption {
 		if v, ok := d.GetOk("squash_option"); ok {
@@ -1153,7 +1153,7 @@ func resourceGitlabProjectRead(ctx context.Context, d *schema.ResourceData, meta
 		return nil
 	}
 
-	if err := resourceGitlabProjectSetToState(client, d, project); err != nil {
+	if err := resourceGitlabProjectSetToState(ctx, client, d, project); err != nil {
 		return diag.FromErr(err)
 	}
 
@@ -1262,7 +1262,7 @@ func resourceGitlabProjectUpdate(ctx context.Context, d *schema.ResourceData, me
 		options.LFSEnabled = gitlab.Bool(d.Get("lfs_enabled").(bool))
 	}
 
-	if supportsSquashOption, err := isGitLabVersionAtLeast(client, "14.1")(); err != nil {
+	if supportsSquashOption, err := isGitLabVersionAtLeast(ctx, client, "14.1")(); err != nil {
 		return diag.FromErr(err)
 	} else if supportsSquashOption && d.HasChange("squash_option") {
 		options.SquashOption = stringToSquashOptionValue(d.Get("squash_option").(string))

internal/provider/resource_gitlab_project_test.go

@@ -3,6 +3,7 @@
 package provider
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"regexp"
@@ -1192,11 +1193,11 @@ func testAccCheckAggregateGitlabProject(expected, received *gitlab.Project) reso
 				}
 			}
 
-			if err := resourceGitlabProjectSetToState(testGitlabClient, expectedData, expected); err != nil {
+			if err := resourceGitlabProjectSetToState(context.Background(), testGitlabClient, expectedData, expected); err != nil {
 				return err
 			}
 
-			if err := resourceGitlabProjectSetToState(testGitlabClient, receivedData, received); err != nil {
+			if err := resourceGitlabProjectSetToState(context.Background(), testGitlabClient, receivedData, received); err != nil {
 				return err
 			}
 

internal/provider/resource_gitlab_project_variable_test.go

@@ -180,7 +180,7 @@ func TestAccGitlabProjectVariable_scoped(t *testing.T) {
 		CheckDestroy: func(state *terraform.State) error {
 			// Destroy behavior is nondeterministic for variables with scopes in GitLab versions prior to 13.4
 			// ref: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39209
-			if isAtLeast134, err := isGitLabVersionAtLeast(testGitlabClient, "13.4")(); err != nil {
+			if isAtLeast134, err := isGitLabVersionAtLeast(context.Background(), testGitlabClient, "13.4")(); err != nil {
 				return err
 			} else if isAtLeast134 {
 				return testAccGitlabProjectVariableCheckAllVariablesDestroyed(ctx)(state)
@@ -246,7 +246,7 @@ resource "gitlab_project_variable" "bar" {
 			// Update an attribute on one of the variables.
 			// Updating a variable with a non-unique key only works reliably on GitLab v13.4+.
 			{
-				SkipFunc: isGitLabVersionLessThan(testGitlabClient, "13.4"),
+				SkipFunc: isGitLabVersionLessThan(context.Background(), testGitlabClient, "13.4"),
 				Config: fmt.Sprintf(`
 resource "gitlab_project_variable" "foo" {
   project = %[1]d
@@ -270,7 +270,7 @@ resource "gitlab_project_variable" "bar" {
 			// Try to have two variables with the same keys and scopes.
 			// On versions of GitLab < 13.4 this can sometimes result in an inconsistent state instead of an error.
 			{
-				SkipFunc: isGitLabVersionLessThan(testGitlabClient, "13.4"),
+				SkipFunc: isGitLabVersionLessThan(context.Background(), testGitlabClient, "13.4"),
 				Config: fmt.Sprintf(`
 resource "gitlab_project_variable" "foo" {
   project = %[1]d

internal/provider/resource_gitlab_topic.go

@@ -185,7 +185,7 @@ func resourceGitlabTopicDelete(ctx context.Context, d *schema.ResourceData, meta
 	}
 	softDestroy := d.Get("soft_destroy").(bool)
 
-	deleteNotSupported, err := isGitLabVersionLessThan(client, "14.9")()
+	deleteNotSupported, err := isGitLabVersionLessThan(ctx, client, "14.9")()
 	if err != nil {
 		return diag.FromErr(err)
 	}

internal/provider/util.go

@@ -225,23 +225,23 @@ func intSetToIntSlice(intSet *schema.Set) *[]int {
 
 // isGitLabVersionLessThan is a SkipFunc that returns true if the provided version is lower then
 // the current version of GitLab. It only checks the major and minor version numbers, not the patch.
-func isGitLabVersionLessThan(client *gitlab.Client, version string) func() (bool, error) {
+func isGitLabVersionLessThan(ctx context.Context, client *gitlab.Client, version string) func() (bool, error) {
 	return func() (bool, error) {
-		isAtLeast, err := isGitLabVersionAtLeast(client, version)()
+		isAtLeast, err := isGitLabVersionAtLeast(ctx, client, version)()
 		return !isAtLeast, err
 	}
 }
 
 // isGitLabVersionAtLeast is a SkipFunc that checks that the version of GitLab is at least the
 // provided wantVersion. It only checks the major and minor version numbers, not the patch.
-func isGitLabVersionAtLeast(client *gitlab.Client, wantVersion string) func() (bool, error) {
+func isGitLabVersionAtLeast(ctx context.Context, client *gitlab.Client, wantVersion string) func() (bool, error) {
 	return func() (bool, error) {
 		wantMajor, wantMinor, err := parseVersionMajorMinor(wantVersion)
 		if err != nil {
 			return false, fmt.Errorf("failed to parse wanted version %q: %w", wantVersion, err)
 		}
 
-		actualVersion, _, err := client.Version.GetVersion()
+		actualVersion, _, err := client.Version.GetVersion(gitlab.WithContext(ctx))
 		if err != nil {
 			return false, err
 		}