resource/gitlab_managed_license: Make GitLab 15.0 compatible

Author: timofurrer

docs/resources/managed_license.md

@@ -37,8 +37,8 @@ resource "gitlab_managed_license" "mit" {
 
 ### Required
 
-- `approval_status` (String) The approval status of the license. Valid values are: `approved`, `blacklisted`, `allowed`, `denied`. "approved" and "blacklisted" 
-				have been deprecated in favor of "allowed" and "denied"; use "allowed" and "denied" for GitLab versions 15.0 and higher. 
+- `approval_status` (String) The approval status of the license. Valid values are: `approved`, `blacklisted`, `allowed`, `denied`. "approved" and "blacklisted"
+				have been deprecated in favor of "allowed" and "denied"; use "allowed" and "denied" for GitLab versions 15.0 and higher.
 				Prior to version 15.0 and after 14.6, the values are equivalent.
 - `name` (String) The name of the managed license (I.e., 'Apache License 2.0' or 'MIT license')
 - `project` (String) The ID of the project under which the managed license will be created.

internal/provider/helper_test.go

@@ -68,22 +68,6 @@ func isRunningInCE() (bool, error) {
 	return !isEE, err
 }
 
-// orSkipFunc accepts many skipFunc and returns "true" if any returns true.
-func orSkipFunc(input ...SkipFunc) SkipFunc {
-	return func() (bool, error) {
-		for _, item := range input {
-			result, err := item()
-			if err != nil {
-				return false, err
-			}
-			if result {
-				return result, nil
-			}
-		}
-		return false, nil
-	}
-}
-
 // testAccCheckEE is a test helper that skips the current test if the GitLab version is not GitLab Enterprise.
 // This is useful when the version needs to be checked during setup, before the Terraform acceptance test starts.
 func testAccCheckEE(t *testing.T) {

internal/provider/resource_gitlab_managed_license.go

@@ -53,8 +53,8 @@ var _ = registerResource("gitlab_managed_license", func() *schema.Resource {
 				ForceNew:         false,
 				ValidateFunc:     validation.StringInSlice(managedLicenseAllowedValues, true),
 				DiffSuppressFunc: checkDeprecatedValuesForDiff,
-				Description: fmt.Sprintf(`The approval status of the license. Valid values are: %s. "approved" and "blacklisted" 
-				have been deprecated in favor of "allowed" and "denied"; use "allowed" and "denied" for GitLab versions 15.0 and higher. 
+				Description: fmt.Sprintf(`The approval status of the license. Valid values are: %s. "approved" and "blacklisted"
+				have been deprecated in favor of "allowed" and "denied"; use "allowed" and "denied" for GitLab versions 15.0 and higher.
 				Prior to version 15.0 and after 14.6, the values are equivalent.`, renderValueListForDocs(managedLicenseAllowedValues)),
 			},
 		},
@@ -65,9 +65,14 @@ func resourceGitlabManagedLicenseCreate(ctx context.Context, d *schema.ResourceD
 	client := meta.(*gitlab.Client)
 	project := d.Get("project").(string)
 
+	approvalStatus, err := stringToApprovalStatus(ctx, client, d.Get("approval_status").(string))
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
 	options := &gitlab.AddManagedLicenseOptions{
 		Name:           gitlab.String(d.Get("name").(string)),
-		ApprovalStatus: stringToApprovalStatus(d.Get("approval_status").(string)),
+		ApprovalStatus: approvalStatus,
 	}
 
 	log.Printf("[DEBUG] create gitlab Managed License on Project %s, with Name %s", project, *options.Name)
@@ -131,12 +136,13 @@ func resourceGitlabManagedLicenseUpdate(ctx context.Context, d *schema.ResourceD
 		return diag.FromErr(err)
 	}
 
-	opts := &gitlab.EditManagedLicenceOptions{
-		ApprovalStatus: stringToApprovalStatus(d.Get("approval_status").(string)),
+	approvalStatus, err := stringToApprovalStatus(ctx, client, d.Get("approval_status").(string))
+	if err != nil {
+		return diag.FromErr(err)
 	}
 
-	if d.HasChange("approval_status") {
-		opts.ApprovalStatus = stringToApprovalStatus(d.Get("approval_status").(string))
+	opts := &gitlab.EditManagedLicenceOptions{
+		ApprovalStatus: approvalStatus,
 	}
 
 	log.Printf("[DEBUG] update gitlab Managed License %s", d.Id())
@@ -152,22 +158,32 @@ func resourceGitlabManagedLicenseUpdate(ctx context.Context, d *schema.ResourceD
 }
 
 // Convert the incoming string into the proper constant value for passing into the API.
-func stringToApprovalStatus(s string) *gitlab.LicenseApprovalStatusValue {
-	lookup := map[string]gitlab.LicenseApprovalStatusValue{
-		"approved":    gitlab.LicenseApproved,
-		"blacklisted": gitlab.LicenseBlacklisted,
-
-		// This is counter-intuitive, but currently the API response from the non-deprecated
-		// values is the deprecated values. So we have to map them here.
-		"allowed": gitlab.LicenseApproved,
-		"denied":  gitlab.LicenseBlacklisted,
-	}
+func stringToApprovalStatus(ctx context.Context, client *gitlab.Client, s string) (*gitlab.LicenseApprovalStatusValue, error) {
+	var value gitlab.LicenseApprovalStatusValue
+	notSupported, err := isGitLabVersionAtLeast(ctx, client, "15.0")()
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch GitLab version: %+v", err)
+	}
+	if notSupported {
+		value = gitlab.LicenseApprovalStatusValue(s)
+	} else {
+		lookup := map[string]gitlab.LicenseApprovalStatusValue{
+			"approved":    gitlab.LicenseApproved,
+			"blacklisted": gitlab.LicenseBlacklisted,
+
+			// This is counter-intuitive, but currently the API response from the non-deprecated
+			// values is the deprecated values. So we have to map them here.
+			"allowed": gitlab.LicenseApproved,
+			"denied":  gitlab.LicenseBlacklisted,
+		}
 
-	value, ok := lookup[s]
-	if !ok {
-		return nil
+		v, ok := lookup[s]
+		if !ok {
+			return nil, fmt.Errorf("invalid approval status value %q", s)
+		}
+		value = v
 	}
-	return &value
+	return &value, nil
 }
 
 func projectIdAndLicenseIdFromId(id string) (string, int, error) {

internal/provider/resource_gitlab_managed_license_test.go

@@ -20,28 +20,21 @@ func TestAccGitlabManagedLicense_basic(t *testing.T) {
 	rInt := acctest.RandInt()
 
 	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccCheckEE(t) },
 		ProviderFactories: providerFactories,
 		CheckDestroy:      testAccCheckManagedLicenseDestroy,
 		Steps: []resource.TestStep{
 			{
 				// Create a managed license with an "allowed" state
-				SkipFunc: isRunningInCE,
-				Config:   testManagedLicenseConfig(rInt, "allowed"),
-				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGitlabManagedLicenseExists("gitlab_managed_license.fixme", &managedLicense),
-				),
+				Config: testManagedLicenseConfig(rInt, "allowed"),
+				Check:  testAccCheckGitlabManagedLicenseExists("gitlab_managed_license.fixme", &managedLicense),
 			},
 			{
 				// Update the managed license to have a denied state
-				SkipFunc: isRunningInCE,
-				Config:   testManagedLicenseConfig(rInt, "denied"),
-				Check: resource.ComposeTestCheckFunc(
-					//Even though the API accepts "denied", it still returns "blacklisted" until 15.0
-					testAccCheckGitlabManagedLicenseStatus("gitlab_managed_license.fixme", "blacklisted", &managedLicense),
-				),
+				Config: testManagedLicenseConfig(rInt, "denied"),
+				Check:  testAccCheckGitlabManagedLicenseStatus("gitlab_managed_license.fixme", "denied", &managedLicense),
 			},
 			{
-				SkipFunc:          isRunningInCE,
 				ResourceName:      "gitlab_managed_license.fixme",
 				ImportState:       true,
 				ImportStateVerify: true,
@@ -55,36 +48,28 @@ func TestAccGitlabManagedLicense_deprecatedConfigValues(t *testing.T) {
 	rInt := acctest.RandInt()
 
 	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccRequiresLessThan(t, "15.0")
+			testAccCheckEE(t)
+		},
 		ProviderFactories: providerFactories,
 		CheckDestroy:      testAccCheckManagedLicenseDestroy,
 		Steps: []resource.TestStep{
 			{
 				// Create a managed license with an "approved" state
-				SkipFunc: orSkipFunc(
-					isRunningInCE,
-					isGitLabVersionLessThan(context.Background(), testGitlabClient, "15.0"),
-				),
 				Config: testManagedLicenseConfig(rInt, "approved"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabManagedLicenseExists("gitlab_managed_license.fixme", &managedLicense),
 				),
 			},
 			{
-				// Update the managed license to have a blacklisted state
-				SkipFunc: orSkipFunc(
-					isRunningInCE,
-					isGitLabVersionLessThan(context.Background(), testGitlabClient, "15.0"),
-				),
+				// Update the managed license to have a "blacklisted" state
 				Config: testManagedLicenseConfig(rInt, "blacklisted"),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabManagedLicenseStatus("gitlab_managed_license.fixme", "blacklisted", &managedLicense),
 				),
 			},
 			{
-				SkipFunc: orSkipFunc(
-					isRunningInCE,
-					isGitLabVersionLessThan(context.Background(), testGitlabClient, "15.0"),
-				),
 				ResourceName:      "gitlab_managed_license.fixme",
 				ImportState:       true,
 				ImportStateVerify: true,
@@ -133,7 +118,11 @@ func testAccCheckGitlabManagedLicenseStatus(resource string, status string, lice
 		}
 
 		for _, gotLicense := range licenses {
-			if gotLicense.ApprovalStatus == *stringToApprovalStatus(status) {
+			approvalStatus, err := stringToApprovalStatus(context.TODO(), testGitlabClient, status)
+			if err != nil {
+				return err
+			}
+			if gotLicense.ApprovalStatus == *approvalStatus {
 				*license = *gotLicense
 				return nil
 			}