Merge canonical master into security master

doc/development/testing_guide/best_practices.md

@@ -168,7 +168,7 @@ can be used:
 
 ```ruby
 RSpec.describe API::Search, factory_default: :keep do
-  let_it_be(:namespace) { create_default(:namespace).freeze }
+  let_it_be(:namespace) { create_default(:namespace) }
 ```
 
 Then every project we create uses this `namespace`, without us having to pass
@@ -186,7 +186,7 @@ projects we create are ones we ask for (76/208). There is benefit in setting
 a default value for projects as well:
 
 ```ruby
-  let_it_be(:project) { create_default(:project).freeze }
+  let_it_be(:project) { create_default(:project) }
 ```
 
 In this case, the `total time` and `top-level time` numbers match more closely:

doc/development/testing_guide/flaky_tests.md

@@ -76,6 +76,33 @@ For instance `RETRIES=1 bin/rspec ...` would retry the failing examples once.
   - [Replace FFaker factory data with sequences](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/29643): <https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10184>
   - [Transient failure in spec/finders/issues_finder_spec.rb](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/30211#note_26707685): <https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10404>
 
+### Order-dependent flaky tests
+
+These flaky tests can fail depending on the order they run with other tests. For example:
+
+- <https://gitlab.com/gitlab-org/gitlab/-/issues/327668>
+
+To identify the tests that lead to such failure, we can use `rspec --bisect`,
+which would give us the minimal test combination to reproduce the failure:
+
+```shell
+rspec --bisect ee/spec/services/ee/merge_requests/update_service_spec.rb ee/spec/services/ee/notes/quick_actions_service_spec.rb ee/spec/services/epic_links/create_service_spec.rb  ee/spec/services/ee/issuable/bulk_update_service_spec.rb
+Bisect started using options: "ee/spec/services/ee/merge_requests/update_service_spec.rb ee/spec/services/ee/notes/quick_actions_service_spec.rb ee/spec/services/epic_links/create_service_spec.rb ee/spec/services/ee/issuable/bulk_update_service_spec.rb"
+Running suite to find failures... (2 minutes 18.4 seconds)
+Starting bisect with 3 failing examples and 144 non-failing examples.
+Checking that failure(s) are order-dependent... failure appears to be order-dependent
+
+Round 1: bisecting over non-failing examples 1-144 . ignoring examples 1-72 (1 minute 11.33 seconds)
+...
+Round 7: bisecting over non-failing examples 132-133 . ignoring example 132 (43.78 seconds)
+Bisect complete! Reduced necessary non-failing examples from 144 to 1 in 8 minutes 31 seconds.
+
+The minimal reproduction command is:
+  rspec ./ee/spec/services/ee/issuable/bulk_update_service_spec.rb[1:2:1:1:1:1,1:2:1:2:1:1,1:2:1:3:1] ./ee/spec/services/epic_links/create_service_spec.rb[1:1:2:2:6:4]
+```
+
+We can reproduce the test failure with the reproduction command above. If we change the order of the tests, the test would pass.
+
 ### Time-sensitive flaky tests
 
 - <https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/10046>

doc/user/clusters/agent/repository.md

@@ -94,3 +94,41 @@ gitops:
       # If 'paths' is not specified or is an empty list, the configuration below is used
     - glob: '/**/*.{yaml,yml,json}'
 ```
+
+## Surface network security alerts from cluster to GitLab
+
+The GitLab Agent provides an [integration with Cilium](index.md#kubernetes-network-security-alerts).
+To integrate, add a top-level `cilium` section to your `config.yml` file. Currently, the
+only configuration option is the Hubble relay address:
+
+```yaml
+cilium:
+  hubble_relay_address: "<hubble-relay-host>:<hubble-relay-port>"
+```
+
+If your Cilium integration was performed through GitLab Managed Apps, you can use `hubble-relay.gitlab-managed-apps.svc.cluster.local:80` as the address:
+
+```yaml
+cilium:
+  hubble_relay_address: "hubble-relay.gitlab-managed-apps.svc.cluster.local:80"
+```
+
+## Debugging
+
+To debug the cluster-side component (`agentk`) of the GitLab Kubernetes Agent, set the log
+level according to the available options:
+
+- `off`
+- `warning`
+- `error`
+- `info`
+- `debug`
+
+The log level defaults to `info`. You can change it by using a top-level `observability`
+section in the configuration file, for example:
+
+```yaml
+observability:
+  logging:
+    level: debug
+```

ee/app/assets/javascripts/pages/admin/cloud_licenses/components/app.vue

 <script>
+import { GlAlert } from '@gitlab/ui';
 import {
+  subscriptionActivationNotificationText,
   subscriptionActivationTitle,
   subscriptionHistoryQueries,
   subscriptionMainTitle,
@@ -13,12 +15,14 @@ import SubscriptionTrialCard from './subscription_trial_card.vue';
 export default {
   name: 'CloudLicenseApp',
   components: {
-    SubscriptionBreakdown,
+    GlAlert,
     CloudLicenseSubscriptionActivationForm,
-    SubscriptionTrialCard,
+    SubscriptionBreakdown,
     SubscriptionPurchaseCard,
+    SubscriptionTrialCard,
   },
   i18n: {
+    subscriptionActivationNotificationText,
     subscriptionActivationTitle,
     subscriptionMainTitle,
   },
@@ -48,13 +52,19 @@ export default {
   },
   data() {
     return {
+      canShowSubscriptionDetails: this.hasActiveLicense,
       currentSubscription: {},
+      shouldShowSubscriptionActivationNotification: false,
       subscriptionHistory: [],
-      canShowSubscriptionDetails: this.hasActiveLicense,
+      notification: null,
     };
   },
   methods: {
+    didDismissSuccessAlert() {
+      this.shouldShowSubscriptionActivationNotification = false;
+    },
     handleActivation(hasLicense) {
+      this.shouldShowSubscriptionActivationNotification = hasLicense;
       this.canShowSubscriptionDetails = hasLicense;
     },
   },
@@ -65,6 +75,14 @@ export default {
   <div class="gl-display-flex gl-justify-content-center gl-flex-direction-column">
     <h4 data-testid="subscription-main-title">{{ $options.i18n.subscriptionMainTitle }}</h4>
     <hr />
+    <gl-alert
+      v-if="shouldShowSubscriptionActivationNotification"
+      variant="success"
+      :title="$options.i18n.subscriptionActivationNotificationText"
+      class="mb-4"
+      data-testid="subscription-activation-success-alert"
+      @dismiss="didDismissSuccessAlert"
+    />
     <subscription-breakdown
       v-if="canShowSubscriptionDetails"
       :subscription="currentSubscription"

ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_activation_form.vue

@@ -84,7 +84,6 @@ export default {
     <template #header>
       <h5 class="gl-my-0 gl-font-weight-bold">{{ $options.i18n.title }}</h5>
     </template>
-
     <p>
       <gl-sprintf :message="$options.i18n.howToActivateSubscription">
         <template #link="{ content }">

ee/app/assets/javascripts/pages/admin/cloud_licenses/constants.js

@@ -4,6 +4,9 @@ import getCurrentLicense from './graphql/queries/get_current_license.query.graph
 import getLicenseHistory from './graphql/queries/get_license_history.query.graphql';
 
 export const subscriptionMainTitle = s__('SuperSonics|Your subscription');
+export const subscriptionActivationNotificationText = s__(
+  `SuperSonics|Your subscription was successfully activated. You can see the details below.`,
+);
 export const subscriptionActivationTitle = s__(
   `SuperSonics|You do not have an active subscription`,
 );

ee/spec/frontend/admin/cloud_licenses/components/app_spec.js

@@ -4,6 +4,7 @@ import CloudLicenseApp from 'ee/pages/admin/cloud_licenses/components/app.vue';
 import SubscriptionActivationForm from 'ee/pages/admin/cloud_licenses/components/subscription_activation_form.vue';
 import SubscriptionBreakdown from 'ee/pages/admin/cloud_licenses/components/subscription_breakdown.vue';
 import {
+  subscriptionActivationNotificationText,
   subscriptionActivationTitle,
   subscriptionHistoryQueries,
   subscriptionMainTitle,
@@ -24,6 +25,8 @@ describe('CloudLicenseApp', () => {
   const findSubscriptionActivationTitle = () =>
     wrapper.findByTestId('subscription-activation-title');
   const findSubscriptionMainTitle = () => wrapper.findByTestId('subscription-main-title');
+  const findSubscriptionActivationSuccessAlert = () =>
+    wrapper.findByTestId('subscription-activation-success-alert');
 
   let currentSubscriptionResolver;
   let subscriptionHistoryResolver;
@@ -84,6 +87,33 @@ describe('CloudLicenseApp', () => {
       it('shows the subscription activation form', () => {
         expect(findActivateSubscriptionForm().exists()).toBe(true);
       });
+
+      it('does not the activation success notification', () => {
+        expect(findSubscriptionActivationSuccessAlert().exists()).toBe(false);
+      });
+    });
+
+    describe('activate the license', () => {
+      beforeEach(() => {
+        createComponent({ hasActiveLicense: false }, [
+          currentSubscriptionResolver,
+          subscriptionHistoryResolver,
+        ]);
+        findActivateSubscriptionForm().vm.$emit('subscription-activation', true);
+      });
+
+      it('passes the correct data to the subscription breakdown', () => {
+        expect(findSubscriptionBreakdown().props()).toMatchObject({
+          subscription: license.ULTIMATE,
+          subscriptionList: subscriptionHistory,
+        });
+      });
+
+      it('shows the activation success notification', () => {
+        expect(findSubscriptionActivationSuccessAlert().props('title')).toBe(
+          subscriptionActivationNotificationText,
+        );
+      });
     });
 
     describe('with active license', () => {
@@ -114,6 +144,10 @@ describe('CloudLicenseApp', () => {
           subscriptionList: subscriptionHistory,
         });
       });
+
+      it('does not the activation success notification', () => {
+        expect(findSubscriptionActivationSuccessAlert().exists()).toBe(false);
+      });
     });
   });
 });

locale/gitlab.pot

@@ -30989,6 +30989,9 @@ msgstr ""
 msgid "SuperSonics|Your subscription"
 msgstr ""
 
+msgid "SuperSonics|Your subscription was successfully activated. You can see the details below."
+msgstr ""
+
 msgid "Support"
 msgstr ""