Add latest changes from gitlab-org/gitlab@master

doc/user/packages/npm_registry/index.md

@@ -280,7 +280,7 @@ page.
 To work with NPM commands within [GitLab CI](./../../../ci/README.md), you can use
 `CI_JOB_TOKEN` in place of the personal access token in your commands.
-A simple example `gitlab-ci.yml` file for publishing NPM packages:
+A simple example `.gitlab-ci.yml` file for publishing NPM packages:
 ```yml
 image: node:latest

doc/user/packages/nuget_repository/index.md

@@ -2,18 +2,21 @@
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/20050) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.8.
-CAUTION: **Work in progress**
-This feature is in development, sections on uploading and installing packages will be coming soon, please follow along and help us make sure we're building the right solution for you in the [NuGet issue](https://gitlab.com/gitlab-org/gitlab/issues/20050).
-
 With the GitLab NuGet Repository, every project can have its own space to store NuGet packages.
-The GitLab NuGet Repository works with either [nuget CLI](https://www.nuget.org/) or [Visual Studio](https://visualstudio.microsoft.com/vs/).
+The GitLab NuGet Repository works with:
+
+- [NuGet CLI](https://docs.microsoft.com/en-us/nuget/reference/nuget-exe-cli-reference)
+- [.NET Core CLI](https://docs.microsoft.com/en-us/dotnet/core/tools/)
+- [Visual Studio](https://visualstudio.microsoft.com/vs/)
 ## Setting up your development environment
-You will need [nuget CLI](https://www.nuget.org/) 5.2 or above. Previous versions have not been tested against the GitLab NuGet Repository and might not work. You can install it by visiting the [downloads page](https://www.nuget.org/downloads).
-If you have [Visual Studio](https://visualstudio.microsoft.com/vs/), [nuget CLI](https://www.nuget.org/) is probably already installed.
+You will need [NuGet CLI 5.2 or later](https://www.nuget.org/downloads). Earlier versions have not been tested
+against the GitLab NuGet Repository and might not work. If you have [Visual Studio](https://visualstudio.microsoft.com/vs/),
+NuGet CLI is probably already installed.
+Alternatively, you can use [.NET SDK 3.0 or later](https://dotnet.microsoft.com/download/dotnet-core/3.0), which installs NuGet CLI.
 You can confirm that [nuget CLI](https://www.nuget.org/) is properly installed with:
@@ -37,7 +40,7 @@ Available commands:
 NOTE: **Note:**
 This option is available only if your GitLab administrator has
-[enabled support for the NuGet Repository](../../../administration/packages/index.md).**(PREMIUM ONLY)**
+[enabled support for the Package Registry](../../../administration/packages/index.md). **(PREMIUM ONLY)**
 After the NuGet Repository is enabled, it will be available for all new projects
 by default. To enable it for existing projects, or if you want to disable it:
@@ -48,7 +51,7 @@ by default. To enable it for existing projects, or if you want to disable it:
 You should then be able to see the **Packages** section on the left sidebar.
-## Adding the GitLab NuGet Repository as a source to nuget
+## Adding the GitLab NuGet Repository as a source to NuGet
 You will need the following:
@@ -57,23 +60,23 @@ You will need the following:
 - A suitable name for your source.
 - Your project ID which can be found on the home page of your project.
-You can now add a new source to nuget either using [nuget CLI](https://www.nuget.org/) or [Visual Studio](https://visualstudio.microsoft.com/vs/).
-### Using nuget CLI
+You can now add a new source to NuGet with:
+
+- [NuGet CLI](#add-nuget-repository-source-with-nuget-cli)
+- [Visual Studio](#add-nuget-repository-source-with-visual-studio).
+- [.NET CLI](#add-nuget-repository-source-with-net-cli)
+### Add NuGet Repository source with NuGet CLI
 To add the GitLab NuGet Repository as a source with `nuget`:
 ```shell
-nuget source Add -Name <source_name> -Source "https://example.gitlab.com/api/v4/projects/<your_project_id>/packages/nuget/index.json" -UserName <gitlab_username> -Password <gitlab_token>
+nuget source Add -Name <source_name> -Source "https://gitlab-instance.example.com/api/v4/projects/<your_project_id>/packages/nuget/index.json" -UserName <gitlab_username> -Password <gitlab_personal_access_token>
 ```
-Replace:
-- `<source_name>` with your desired source name.
-- `<your_project_id>` with your project ID.
-- `<gitlab-username>` with your GitLab username.
-- `<gitlab-token>` with your personal access token.
-- `example.gitlab.com` with the URL of the GitLab instance you're using.
+Where:
+- `<source_name>` is your desired source name.
 For example:
@@ -81,7 +84,7 @@ For example:
 nuget source Add -Name "GitLab" -Source "https//gitlab.example/api/v4/projects/10/packages/nuget/index.json" -UserName carol -Password 12345678asdf
 ```
-### Using Visual Studio
+### Add NuGet Repository source with Visual Studio
 1. Open [Visual Studio](https://visualstudio.microsoft.com/vs/).
 1. Open the **FILE > OPTIONS** (Windows) or **Visual Studio > Preferences** (Mac OS).
@@ -102,3 +105,109 @@ nuget source Add -Name "GitLab" -Source "https//gitlab.example/api/v4/projects/1
    ![Visual Studio NuGet source added](img/visual_studio_nuget_source_added.png)
 In case of any warning, please make sure that the **Location**, **Username** and **Password** are correct.
+
+### Add NuGet Repository source with .NET CLI
+
+To add the GitLab NuGet Repository as a source for .NET, create a file named `nuget.config` in the root of your project with the following content:
+
+```xml
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <packageSources>
+        <clear />
+        <add key="gitlab" value="https://gitlab-instance.example.com/api/v4/projects/<your_project_id>/packages/nuget/index.json" />
+    </packageSources>
+    <packageSourceCredentials>
+        <gitlab>
+            <add key="Username" value="<gitlab_username>" />
+            <add key="ClearTextPassword" value="<gitlab_personal_access_token>" />
+        </gitlab>
+    </packageSourceCredentials>
+</configuration>
+```
+
+## Uploading packages
+
+When uploading packages, note that:
+
+- The maximum allowed size is 50 Megabytes.
+- If you upload the same package with the same version multiple times, each consecutive upload
+  is saved as a separate file. When installing a package, GitLab will serve the most recent file.
+- When uploading packages to GitLab, they will not be displayed in the packages UI of your project
+  immediately. It can take up to 10 minutes to process a package.
+
+### Upload packages with NuGet CLI
+
+This section assumes that your project is properly built and you already [created a NuGet package with NuGet CLI](https://docs.microsoft.com/en-us/nuget/create-packages/creating-a-package).
+Upload your package using the following command:
+
+```shell
+nuget push <package_file> -Source <source_name>
+```
+
+Where:
+
+- `<package_file>` is your package filename, ending in `.nupkg`.
+- `<source_name>` is the [source name used during setup](#adding-the-gitlab-nuget-repository-as-a-source-to-nuget).
+
+### Upload packages with .NET CLI
+
+This section assumes that your project is properly built and you already [created a NuGet package with .NET CLI](https://docs.microsoft.com/en-us/nuget/create-packages/creating-a-package-dotnet-cli.).
+Upload your package using the following command:
+
+```shell
+dotnet nuget push <package_file> --source <source_name>
+```
+
+Where:
+
+- `<package_file>` is your package filename, ending in `.nupkg`.
+- `<source_name>` is the [source name used during setup](#adding-the-gitlab-nuget-repository-as-a-source-to-nuget).
+
+For example:
+
+```shell
+dotnet nuget push MyPackage.1.0.0.nupkg --source gitlab
+```
+
+## Install packages
+
+### Install a package with NuGet CLI
+
+CAUTION: **Warning:**
+By default, `nuget` checks the official source at `nuget.org` first. If you have a package in the
+GitLab NuGet Repository with the same name as a package at `nuget.org`, you must specify the source
+name or the wrong package will be installed.
+Install the latest version of a package using the following command:
+
+```shell
+nuget install <package_id> -OutputDirectory <output_directory> \
+  -Version <package_version> \
+  -Source <source_name>
+```
+
+Where:
+
+- `<package_id>` is the package id.
+- `<output_directory>` is the output directory, where the package will be installed.
+- `<package_version>` (Optional) is the package version.
+- `<source_name>` (Optional) is the source name.
+
+### Install a package with .NET CLI
+
+CAUTION: **Warning:**
+If you have a package in the GitLab NuGet Repository with the same name as a package at a different source,
+you should verify the order in which `dotnet` checks sources during install. This is defined in the
+`nuget.config` file.
+
+Install the latest version of a package using the following command:
+
+```shell
+dotnet add package <package_id> \
+       -v <package_version>
+```
+
+Where:
+
+- `<package_id>` is the package id.
+- `<package_version>` (Optional) is the package version.

lib/gitlab/kubernetes/helm.rb

@@ -10,6 +10,12 @@ module Gitlab
       SERVICE_ACCOUNT = 'tiller'
       CLUSTER_ROLE_BINDING = 'tiller-admin'
       CLUSTER_ROLE = 'cluster-admin'
+
+      MANAGED_APPS_LOCAL_TILLER_FEATURE_FLAG = :managed_apps_local_tiller
+
+      def self.local_tiller_enabled?
+        Feature.enabled?(MANAGED_APPS_LOCAL_TILLER_FEATURE_FLAG)
+      end
     end
   end
 end

lib/gitlab/kubernetes/helm/client_command.rb

@@ -59,7 +59,7 @@ module Gitlab
         end
         def local_tiller_enabled?
-          Feature.enabled?(:managed_apps_local_tiller)
+          ::Gitlab::Kubernetes::Helm.local_tiller_enabled?
         end
       end
     end

lib/gitlab/serverless/domain.rb

-# frozen_string_literal: true
-
-module Gitlab
-  module Serverless
-    class Domain
-      UUID_LENGTH = 14
-
-      def self.generate_uuid
-        SecureRandom.hex(UUID_LENGTH / 2)
-      end
-    end
-  end
-end

lib/gitlab/serverless/function_uri.rb

-# frozen_string_literal: true
-
-module Gitlab
-  module Serverless
-    class FunctionURI < URI::HTTPS
-      SERVERLESS_DOMAIN_REGEXP = %r{^(?<scheme>https?://)?(?<function>[^.]+)-(?<cluster_left>\h{2})a1(?<cluster_middle>\h{10})f2(?<cluster_right>\h{2})(?<environment_id>\h+)-(?<environment_slug>[^.]+)\.(?<domain>.+)}.freeze
-
-      attr_reader :function, :cluster, :environment
-
-      def initialize(function: nil, cluster: nil, environment: nil)
-        initialize_required_argument(:function, function)
-        initialize_required_argument(:cluster, cluster)
-        initialize_required_argument(:environment, environment)
-
-        @host = "#{function}-#{cluster.uuid[0..1]}a1#{cluster.uuid[2..-3]}f2#{cluster.uuid[-2..-1]}#{"%x" % environment.id}-#{environment.slug}.#{cluster.domain}"
-
-        super('https', nil, host, nil, nil, nil, nil, nil, nil)
-      end
-
-      def self.parse(uri)
-        match = SERVERLESS_DOMAIN_REGEXP.match(uri)
-        return unless match
-
-        cluster = ::Serverless::DomainCluster.find(match[:cluster_left] + match[:cluster_middle] + match[:cluster_right])
-        return unless cluster
-
-        environment = ::Environment.find(match[:environment_id].to_i(16))
-        return unless environment&.slug == match[:environment_slug]
-
-        new(
-          function: match[:function],
-          cluster: cluster,
-          environment: environment
-        )
-      end
-
-      private
-
-      def initialize_required_argument(name, value)
-        raise ArgumentError.new("missing argument: #{name}") unless value
-
-        instance_variable_set("@#{name}".to_sym, value)
-      end
-    end
-  end
-end

lib/gitlab/serverless/service.rb

@@ -60,7 +60,11 @@ class Gitlab::Serverless::Service
   def proxy_url
     if cluster&.serverless_domain
-      Gitlab::Serverless::FunctionURI.new(function: name, cluster: cluster.serverless_domain, environment: environment)
+      ::Serverless::Domain.new(
+        function_name: name,
+        serverless_domain_cluster: cluster.serverless_domain,
+        environment: environment
+      ).uri.to_s
     end
   end

qa/qa/page/project/operations/metrics.rb

@@ -12,11 +12,8 @@ module QA
             element :prometheus_graphs
           end
-          view 'app/assets/javascripts/monitoring/components/charts/time_series.vue' do
-            element :prometheus_graph_widgets
-          end
-
           view 'app/assets/javascripts/monitoring/components/panel_type.vue' do
+            element :prometheus_graph_widgets
             element :prometheus_widgets_dropdown
             element :alert_widget_menu_item
           end

spec/controllers/projects/serverless/functions_controller_spec.rb

@@ -135,7 +135,7 @@ describe Projects::Serverless::FunctionsController do
         context 'when there is no serverless domain for a cluster' do
           it 'keeps function URL as it was' do
-            expect(Gitlab::Serverless::Domain).not_to receive(:new)
+            expect(::Serverless::Domain).not_to receive(:new)
             get :index, params: params({ format: :json })
             expect(response).to have_gitlab_http_status(:ok)

spec/factories/clusters/applications/helm.rb

@@ -73,39 +73,71 @@ FactoryBot.define do
     factory :clusters_applications_ingress, class: 'Clusters::Applications::Ingress' do
       modsecurity_enabled { false }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
     factory :clusters_applications_cert_manager, class: 'Clusters::Applications::CertManager' do
       email { 'admin@example.com' }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
     factory :clusters_applications_elastic_stack, class: 'Clusters::Applications::ElasticStack' do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
     factory :clusters_applications_crossplane, class: 'Clusters::Applications::Crossplane' do
       stack { 'gcp' }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
     factory :clusters_applications_prometheus, class: 'Clusters::Applications::Prometheus' do
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
     factory :clusters_applications_runner, class: 'Clusters::Applications::Runner' do
       runner factory: %i(ci_runner)
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
     factory :clusters_applications_knative, class: 'Clusters::Applications::Knative' do
       hostname { 'example.com' }
       cluster factory: %i(cluster with_installed_helm provided_by_gcp)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
     factory :clusters_applications_jupyter, class: 'Clusters::Applications::Jupyter' do
       oauth_application factory: :oauth_application
       cluster factory: %i(cluster with_installed_helm provided_by_gcp project)
+
+      trait :no_helm_installed do
+        cluster factory: %i(cluster provided_by_gcp)
+      end
     end
   end
 end

spec/factories/serverless/domain.rb

+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :serverless_domain, class: '::Serverless::Domain' do
+    function_name { 'test-function' }
+    serverless_domain_cluster { create(:serverless_domain_cluster) }
+    environment { create(:environment) }
+
+    skip_create
+  end
+end

spec/finders/serverless_domain_finder_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ServerlessDomainFinder do
+  let(:function_name) { 'test-function' }
+  let(:pages_domain_name) { 'serverless.gitlab.io' }
+  let(:pages_domain) { create(:pages_domain, :instance_serverless, domain: pages_domain_name) }
+  let!(:serverless_domain_cluster) { create(:serverless_domain_cluster, uuid: 'abcdef12345678', pages_domain: pages_domain) }
+  let(:valid_cluster_uuid) { 'aba1cdef123456f278' }
+  let(:invalid_cluster_uuid) { 'aba1cdef123456f178' }
+  let!(:environment) { create(:environment, name: 'test') }
+
+  let(:valid_uri) { "https://#{function_name}-#{valid_cluster_uuid}#{"%x" % environment.id}-#{environment.slug}.#{pages_domain_name}" }
+  let(:valid_fqdn) { "#{function_name}-#{valid_cluster_uuid}#{"%x" % environment.id}-#{environment.slug}.#{pages_domain_name}" }
+  let(:invalid_uri) { "https://#{function_name}-#{invalid_cluster_uuid}#{"%x" % environment.id}-#{environment.slug}.#{pages_domain_name}" }
+
+  let(:valid_finder) { described_class.new(valid_uri) }
+  let(:invalid_finder) { described_class.new(invalid_uri) }
+
+  describe '#serverless?' do
+    context 'with a valid URI' do
+      subject { valid_finder.serverless? }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'with an invalid URI' do
+      subject { invalid_finder.serverless? }
+
+      it { is_expected.to be_falsy }
+    end
+  end
+
+  describe '#serverless_domain_cluster_uuid' do
+    context 'with a valid URI' do
+      subject { valid_finder.serverless_domain_cluster_uuid }
+
+      it { is_expected.to eq serverless_domain_cluster.uuid }
+    end
+
+    context 'with an invalid URI' do
+      subject { invalid_finder.serverless_domain_cluster_uuid }
+
+      it { is_expected.to be_nil }
+    end
+  end
+
+  describe '#execute' do
+    context 'with a valid URI' do
+      let(:serverless_domain) do
+        create(
+          :serverless_domain,
+          function_name: function_name,
+          serverless_domain_cluster: serverless_domain_cluster,
+          environment: environment
+        )
+      end
+
+      subject { valid_finder.execute }
+
+      it 'has the correct function_name' do
+        expect(subject.function_name).to eq function_name
+      end
+
+      it 'has the correct serverless_domain_cluster' do
+        expect(subject.serverless_domain_cluster).to eq serverless_domain_cluster
+      end
+
+      it 'has the correct environment' do
+        expect(subject.environment).to eq environment
+      end
+    end
+
+    context 'with an invalid URI' do
+      subject { invalid_finder.execute }
+
+      it { is_expected.to be_nil }
+    end
+  end
+end

spec/frontend/monitoring/components/charts/anomaly_spec.js

@@ -11,7 +11,6 @@ import {
 } from '../../mock_data';
 import MonitorTimeSeriesChart from '~/monitoring/components/charts/time_series.vue';
-const mockWidgets = 'mockWidgets';
 const mockProjectPath = `${TEST_HOST}${mockProjectDir}`;
 jest.mock('~/lib/utils/icon_utils'); // mock getSvgIconPathContent
@@ -35,9 +34,6 @@ describe('Anomaly chart component', () => {
   const setupAnomalyChart = props => {
     wrapper = shallowMount(Anomaly, {
       propsData: { ...props },
-      slots: {
-        default: mockWidgets,
-      },
     });
   };
   const findTimeSeries = () => wrapper.find(MonitorTimeSeriesChart);

spec/frontend/monitoring/components/charts/empty_chart_spec.js

@@ -13,14 +13,6 @@ describe('Empty Chart component', () => {
     });
   });
-  afterEach(() => {
-    emptyChart.destroy();
-  });
-
-  it('render the chart title', () => {
-    expect(emptyChart.find({ ref: 'graphTitle' }).text()).toBe(graphTitle);
-  });
-
   describe('Computed props', () => {
     it('sets the height for the svg container', () => {
       expect(emptyChart.vm.svgContainerStyle.height).toBe('300px');

spec/frontend/monitoring/components/charts/time_series_spec.js

@@ -16,8 +16,6 @@ import {
 } from '../../mock_data';
 import * as iconUtils from '~/lib/utils/icon_utils';
-const mockWidgets = 'mockWidgets';
-
 const mockSvgPathContent = 'mockSvgPathContent';
 jest.mock('lodash/throttle', () =>
@@ -65,9 +63,6 @@ describe('Time series component', () => {
           deploymentData: store.state.monitoringDashboard.deploymentData,
           projectPath: `${mockHost}${mockProjectDir}`,
         },
-        slots: {
-          default: mockWidgets,
-        },
         store,
       });
   });
@@ -82,14 +77,6 @@ describe('Time series component', () => {
       timeSeriesChart.vm.$nextTick(done);
     });
-    it('renders chart title', () => {
-      expect(timeSeriesChart.find('.js-graph-title').text()).toBe(mockGraphData.title);
-    });
-
-    it('contains graph widgets from slot', () => {
-      expect(timeSeriesChart.find('.js-graph-widgets').text()).toBe(mockWidgets);
-    });
-
     it('allows user to override max value label text using prop', () => {
       timeSeriesChart.setProps({ legendMaxText: 'legendMaxText' });

spec/frontend/monitoring/components/panel_type_spec.js

@@ -74,6 +74,18 @@ describe('Panel Type component', () => {
         glEmptyChart = wrapper.find(EmptyChart);
       });
+      it('renders the chart title', () => {
+        expect(wrapper.find({ ref: 'graphTitle' }).text()).toBe(graphDataNoResult.title);
+      });
+
+      it('renders the no download csv link', () => {
+        expect(wrapper.find({ ref: 'downloadCsvLink' }).exists()).toBe(false);
+      });
+
+      it('does not contain graph widgets', () => {
+        expect(wrapper.find('.js-graph-widgets').exists()).toBe(false);
+      });
+
       it('is a Vue instance', () => {
         expect(glEmptyChart.isVueInstance()).toBe(true);
       });
@@ -97,6 +109,15 @@ describe('Panel Type component', () => {
       wrapper.destroy();
     });
+    it('renders the chart title', () => {
+      expect(wrapper.find({ ref: 'graphTitle' }).text()).toBe(graphDataPrometheusQueryRange.title);
+    });
+
+    it('contains graph widgets', () => {
+      expect(wrapper.find('.js-graph-widgets').exists()).toBe(true);
+      expect(wrapper.find({ ref: 'downloadCsvLink' }).exists()).toBe(true);
+    });
+
     it('sets no clipboard copy link on dropdown by default', () => {
       expect(findCopyLink().exists()).toBe(false);
     });

spec/frontend/monitoring/shared/prometheus_header_spec.js

-import { shallowMount } from '@vue/test-utils';
-import PrometheusHeader from '~/monitoring/components/shared/prometheus_header.vue';
-
-describe('Prometheus Header component', () => {
-  let prometheusHeader;
-
-  beforeEach(() => {
-    prometheusHeader = shallowMount(PrometheusHeader, {
-      propsData: {
-        graphTitle: 'graph header',
-      },
-    });
-  });
-
-  afterEach(() => {
-    prometheusHeader.destroy();
-  });
-
-  describe('Prometheus header component', () => {
-    it('should show a title', () => {
-      const title = prometheusHeader.find({ ref: 'title' }).text();
-
-      expect(title).toBe('graph header');
-    });
-  });
-});

spec/lib/gitlab/serverless/domain_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Gitlab::Serverless::Domain do
-  describe '.generate_uuid' do
-    it 'has 14 characters' do
-      expect(described_class.generate_uuid.length).to eq(described_class::UUID_LENGTH)
-    end
-
-    it 'consists of only hexadecimal characters' do
-      expect(described_class.generate_uuid).to match(/\A\h+\z/)
-    end
-
-    it 'uses random characters' do
-      uuid = 'abcd1234567890'
-
-      expect(SecureRandom).to receive(:hex).with(described_class::UUID_LENGTH / 2).and_return(uuid)
-      expect(described_class.generate_uuid).to eq(uuid)
-    end
-  end
-end

spec/lib/gitlab/serverless/function_uri_spec.rb

-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Gitlab::Serverless::FunctionURI do
-  let(:function) { 'test-function' }
-  let(:domain) { 'serverless.gitlab.io' }
-  let(:pages_domain) { create(:pages_domain, :instance_serverless, domain: domain) }
-  let!(:cluster) { create(:serverless_domain_cluster, uuid: 'abcdef12345678', pages_domain: pages_domain) }
-  let(:valid_cluster) { 'aba1cdef123456f278' }
-  let(:invalid_cluster) { 'aba1cdef123456f178' }
-  let!(:environment) { create(:environment, name: 'test') }
-
-  let(:valid_uri) { "https://#{function}-#{valid_cluster}#{"%x" % environment.id}-#{environment.slug}.#{domain}" }
-  let(:valid_fqdn) { "#{function}-#{valid_cluster}#{"%x" % environment.id}-#{environment.slug}.#{domain}" }
-  let(:invalid_uri) { "https://#{function}-#{invalid_cluster}#{"%x" % environment.id}-#{environment.slug}.#{domain}" }
-
-  shared_examples 'a valid FunctionURI class' do
-    describe '#to_s' do
-      it 'matches valid URI' do
-        expect(subject.to_s).to eq valid_uri
-      end
-    end
-
-    describe '#function' do
-      it 'returns function' do
-        expect(subject.function).to eq function
-      end
-    end
-
-    describe '#cluster' do
-      it 'returns cluster' do
-        expect(subject.cluster).to eq cluster
-      end
-    end
-
-    describe '#environment' do
-      it 'returns environment' do
-        expect(subject.environment).to eq environment
-      end
-    end
-  end
-
-  describe '.new' do
-    context 'with valid arguments' do
-      subject { described_class.new(function: function, cluster: cluster, environment: environment) }
-
-      it_behaves_like 'a valid FunctionURI class'
-    end
-
-    context 'with invalid arguments' do
-      subject { described_class.new(function: function, environment: environment) }
-
-      it 'raises an exception' do
-        expect { subject }.to raise_error(ArgumentError)
-      end
-    end
-  end
-
-  describe '.parse' do
-    context 'with valid URI' do
-      subject { described_class.parse(valid_uri) }
-
-      it_behaves_like 'a valid FunctionURI class'
-    end
-
-    context 'with valid FQDN' do
-      subject { described_class.parse(valid_fqdn) }
-
-      it_behaves_like 'a valid FunctionURI class'
-    end
-
-    context 'with invalid URI' do
-      subject { described_class.parse(invalid_uri) }
-
-      it 'returns nil' do
-        expect(subject).to be_nil
-      end
-    end
-  end
-end

spec/lib/gitlab/serverless/service_spec.rb

@@ -94,17 +94,19 @@ describe Gitlab::Serverless::Service do
   end
   describe '#url' do
+    let(:serverless_domain) { instance_double(::Serverless::Domain, uri: URI('https://proxy.example.com')) }
+
     it 'returns proxy URL if cluster has serverless domain' do
       # cluster = create(:cluster)
       knative = create(:clusters_applications_knative, :installed, cluster: cluster)
       create(:serverless_domain_cluster, clusters_applications_knative_id: knative.id)
       service = Gitlab::Serverless::Service.new(attributes.merge('cluster' => cluster))
-      expect(Gitlab::Serverless::FunctionURI).to receive(:new).with(
-        function: service.name,
-        cluster: service.cluster.serverless_domain,
+      expect(::Serverless::Domain).to receive(:new).with(
+        function_name: service.name,
+        serverless_domain_cluster: service.cluster.serverless_domain,
         environment: service.environment
-      ).and_return('https://proxy.example.com')
+      ).and_return(serverless_domain)
       expect(service.url).to eq('https://proxy.example.com')
     end