Merge branch 'create-deploy-token-resource-api' into 'master'

Fabricate project deploy token resource via API

See merge request gitlab-org/gitlab!74901

qa/qa/resource/deploy_token.rb → qa/qa/resource/project_deploy_token.rb

@@ -2,25 +2,13 @@
 
 module QA
   module Resource
-    class DeployToken < Base
+    class ProjectDeployToken < Base
       attr_accessor :name, :expires_at
       attr_writer :scopes
 
-      attribute :username do
-        Page::Project::Settings::Repository.perform do |repository_page|
-          repository_page.expand_deploy_tokens do |token|
-            token.token_username
-          end
-        end
-      end
-
-      attribute :password do
-        Page::Project::Settings::Repository.perform do |repository_page|
-          repository_page.expand_deploy_tokens do |token|
-            token.token_password
-          end
-        end
-      end
+      attribute :id
+      attribute :token
+      attribute :username
 
       attribute :project do
         Project.fabricate! do |resource|
@@ -29,6 +17,35 @@ module QA
         end
       end
 
+      def fabricate_via_api!
+        super
+      end
+
+      def api_get_path
+        "/projects/#{project.id}/deploy_tokens"
+      end
+
+      def api_post_path
+        api_get_path
+      end
+
+      def api_post_body
+        {
+          name: @name,
+          scopes: @scopes
+        }
+      end
+
+      def api_delete_path
+        "/projects/#{project.id}/deploy_tokens/#{id}"
+      end
+
+      def resource_web_url(resource)
+        super
+      rescue ResourceURLMissingError
+        # this particular resource does not expose a web_url property
+      end
+
       def fabricate!
         project.visit!
 

qa/qa/specs/features/browser_ui/5_package/container_registry/container_registry_omnibus_spec.rb

@@ -14,15 +14,15 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'registry-deploy-token'
           deploy_token.project = project
-          deploy_token.scopes = [
-            :read_repository,
-            :read_package_registry,
-            :write_package_registry,
-            :read_registry,
-            :write_registry
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
+            read_registry
+            write_registry
           ]
         end
       end
@@ -60,7 +60,7 @@ module QA
           when :personal_access_token
             "\"#{personal_access_token}\""
           when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
+            "\"#{project_deploy_token.token}\""
           when :ci_job_token
             '$CI_JOB_TOKEN'
           end

qa/qa/specs/features/browser_ui/5_package/package_registry/helm_registry_spec.rb

@@ -88,7 +88,7 @@ module QA
             when :ci_job_token
               '${CI_JOB_TOKEN}'
             when :project_deploy_token
-              project_deploy_token.password
+              project_deploy_token.token
             end
           end
 

qa/qa/specs/features/browser_ui/5_package/package_registry/maven_gradle_repository_spec.rb

@@ -97,7 +97,7 @@ module QA
           when :ci_job_token
             'System.getenv("CI_JOB_TOKEN")'
           when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
+            "\"#{project_deploy_token.token}\""
           end
         end
 

qa/qa/specs/features/browser_ui/5_package/package_registry/maven_repository_spec.rb

@@ -142,7 +142,7 @@ module QA
           when :ci_job_token
             '${env.CI_JOB_TOKEN}'
           when :project_deploy_token
-            project_deploy_token.password
+            project_deploy_token.token
           end
         end
 

qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_instance_level_spec.rb

@@ -16,13 +16,13 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'npm-deploy-token'
           deploy_token.project = project
-          deploy_token.scopes = [
-            :read_repository,
-            :read_package_registry,
-            :write_package_registry
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
           ]
         end
       end
@@ -151,7 +151,7 @@ module QA
           when :ci_job_token
             '${CI_JOB_TOKEN}'
           when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
+            "\"#{project_deploy_token.token}\""
           end
         end
 

qa/qa/specs/features/browser_ui/5_package/package_registry/npm/npm_project_level_spec.rb

@@ -16,13 +16,13 @@ module QA
       end
 
       let(:project_deploy_token) do
-        Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
+        Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
           deploy_token.name = 'npm-deploy-token'
           deploy_token.project = project
-          deploy_token.scopes = [
-            :read_repository,
-            :read_package_registry,
-            :write_package_registry
+          deploy_token.scopes = %w[
+            read_repository
+            read_package_registry
+            write_package_registry
           ]
         end
       end
@@ -129,7 +129,7 @@ module QA
           when :ci_job_token
             '${CI_JOB_TOKEN}'
           when :project_deploy_token
-            "\"#{project_deploy_token.password}\""
+            "\"#{project_deploy_token.token}\""
           end
         end
 

qa/qa/specs/features/browser_ui/6_release/deploy_token/add_deploy_token_spec.rb

@@ -9,14 +9,14 @@ module QA
         deploy_token_name = 'deploy token name'
         one_week_from_now = Date.today + 7
 
-        deploy_token = Resource::DeployToken.fabricate_via_browser_ui! do |resource|
+        deploy_token = Resource::ProjectDeployToken.fabricate_via_api! do |resource|
           resource.name = deploy_token_name
           resource.expires_at = one_week_from_now
-          resource.scopes = [:read_repository]
+          resource.scopes = %w[read_repository]
         end
 
         expect(deploy_token.username.length).to be > 0
-        expect(deploy_token.password.length).to be > 0
+        expect(deploy_token.token.length).to be > 0
       end
     end
   end

qa/spec/support/shared_contexts/packages_registry_shared_context.rb

@@ -42,13 +42,13 @@ module QA
     end
 
     let(:project_deploy_token) do
-      Resource::DeployToken.fabricate_via_browser_ui! do |deploy_token|
+      Resource::ProjectDeployToken.fabricate_via_api! do |deploy_token|
         deploy_token.name = 'package-deploy-token'
         deploy_token.project = package_project
-        deploy_token.scopes = [
-          :read_repository,
-          :read_package_registry,
-          :write_package_registry
+        deploy_token.scopes = %w[
+          read_repository
+          read_package_registry
+          write_package_registry
         ]
       end
     end