Fix go tests

ammario · ammario · commit 335fdc4752af · 2022-12-03T23:05:34.000Z
diff --git a/enterprise/coderd/coderdenttest/coderdenttest_test.go b/enterprise/coderd/coderdenttest/coderdenttest_test.go
@@ -49,6 +49,7 @@ func TestAuthorizeAllEndpoints(t *testing.T) {
 
 	skipRoutes, assertRoute := coderdtest.AGPLRoutes(a)
 	skipRoutes["GET:/api/v2/organizations/{organization}/provisionerdaemons/serve"] = "This route checks for RBAC dependent on input parameters!"
+	skipRoutes["GET:/api/v2/service-banner/"] = "This route is available to all users"
 
 	assertRoute["GET:/api/v2/entitlements"] = coderdtest.RouteCheck{
 		NoAuthorize: true,
diff --git a/enterprise/coderd/license/license_test.go b/enterprise/coderd/license/license_test.go
@@ -27,6 +27,7 @@ func TestEntitlements(t *testing.T) {
 		codersdk.FeatureTemplateRBAC:               true,
 		codersdk.FeatureMultipleGitAuth:            true,
 		codersdk.FeatureExternalProvisionerDaemons: true,
+		codersdk.FeatureServiceBanners:             true,
 	}
 
 	t.Run("Defaults", func(t *testing.T) {
@@ -70,6 +71,7 @@ func TestEntitlements(t *testing.T) {
 				TemplateRBAC:               true,
 				MultipleGitAuth:            true,
 				ExternalProvisionerDaemons: true,
+				ServiceBanners:             true,
 			}),
 			Exp: time.Now().Add(time.Hour),
 		})
@@ -78,7 +80,7 @@ func TestEntitlements(t *testing.T) {
 		require.True(t, entitlements.HasLicense)
 		require.False(t, entitlements.Trial)
 		for _, featureName := range codersdk.FeatureNames {
-			require.Equal(t, codersdk.EntitlementEntitled, entitlements.Features[featureName].Entitlement)
+			require.Equal(t, codersdk.EntitlementEntitled, entitlements.Features[featureName].Entitlement, featureName)
 		}
 	})
 	t.Run("SingleLicenseGrace", func(t *testing.T) {
@@ -93,6 +95,7 @@ func TestEntitlements(t *testing.T) {
 				HighAvailability:           true,
 				TemplateRBAC:               true,
 				ExternalProvisionerDaemons: true,
+				ServiceBanners:             true,
 				GraceAt:                    time.Now().Add(-time.Hour),
 				ExpiresAt:                  time.Now().Add(time.Hour),
 			}),
diff --git a/enterprise/coderd/licenses_test.go b/enterprise/coderd/licenses_test.go
@@ -109,6 +109,7 @@ func TestGetLicense(t *testing.T) {
 			codersdk.FeatureTemplateRBAC:               json.Number("1"),
 			codersdk.FeatureMultipleGitAuth:            json.Number("0"),
 			codersdk.FeatureExternalProvisionerDaemons: json.Number("0"),
+			codersdk.FeatureServiceBanners:             json.Number("0"),
 		}, licenses[0].Claims["features"])
 		assert.Equal(t, int32(2), licenses[1].ID)
 		assert.Equal(t, "testing2", licenses[1].Claims["account_id"])
@@ -122,6 +123,7 @@ func TestGetLicense(t *testing.T) {
 			codersdk.FeatureTemplateRBAC:               json.Number("0"),
 			codersdk.FeatureMultipleGitAuth:            json.Number("0"),
 			codersdk.FeatureExternalProvisionerDaemons: json.Number("0"),
+			codersdk.FeatureServiceBanners:             json.Number("0"),
 		}, licenses[1].Claims["features"])
 	})
 }
diff --git a/enterprise/coderd/servicebanner.go b/enterprise/coderd/servicebanner.go
@@ -70,7 +70,7 @@ func validateHexColor(color string) error {
 func (api *API) putServiceBanner(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 
-	if !api.AGPL.Authorize(r, rbac.ActionUpdate, rbac.ResourceDeploymentConfig) {
+	if !api.Authorize(r, rbac.ActionUpdate, rbac.ResourceDeploymentConfig) {
 		httpapi.Write(ctx, rw, http.StatusForbidden, codersdk.Response{
 			Message: "Insufficient permissions to update service banner",
 		})
