From 5afcbe03ead9ada87621888a31a62652b10a7e4f Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 20 Sep 2023 11:18:08 +0000
Subject: Add latest changes from gitlab-org/gitlab@16-4-stable-ee

---
 .../graphql/queries/environment.query.graphql       |  1 +
 .../queries/environment_cluster_agent.query.graphql |  1 +
 ...t_cluster_agent_with_flux_resource.query.graphql | 21 ---------------------
 .../environment_with_flux_resource.query.graphql    | 16 ----------------
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 app/assets/javascripts/environments/graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql
 delete mode 100644 app/assets/javascripts/environments/graphql/queries/environment_with_flux_resource.query.graphql

(limited to 'app/assets/javascripts/environments/graphql/queries')

diff --git a/app/assets/javascripts/environments/graphql/queries/environment.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment.query.graphql
index 53dfe5303f3..2d6faed5c88 100644
--- a/app/assets/javascripts/environments/graphql/queries/environment.query.graphql
+++ b/app/assets/javascripts/environments/graphql/queries/environment.query.graphql
@@ -6,6 +6,7 @@ query getEnvironment($projectFullPath: ID!, $environmentName: String) {
       name
       externalUrl
       kubernetesNamespace
+      fluxResourcePath
       clusterAgent {
         id
         name
diff --git a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql
index 19374ae7a81..3f8874f2a8d 100644
--- a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql
+++ b/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent.query.graphql
@@ -3,6 +3,7 @@ query getEnvironmentClusterAgent($projectFullPath: ID!, $environmentName: String
     id
     environment(name: $environmentName) {
       id
+      fluxResourcePath
       kubernetesNamespace
       clusterAgent {
         id
diff --git a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql
deleted file mode 100644
index 80363a06d42..00000000000
--- a/app/assets/javascripts/environments/graphql/queries/environment_cluster_agent_with_flux_resource.query.graphql
+++ /dev/null
@@ -1,21 +0,0 @@
-query getEnvironmentClusterAgentWithFluxResource($projectFullPath: ID!, $environmentName: String) {
-  project(fullPath: $projectFullPath) {
-    id
-    environment(name: $environmentName) {
-      id
-      kubernetesNamespace
-      fluxResourcePath
-      clusterAgent {
-        id
-        name
-        webPath
-        tokens {
-          nodes {
-            id
-            lastUsedAt
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/app/assets/javascripts/environments/graphql/queries/environment_with_flux_resource.query.graphql b/app/assets/javascripts/environments/graphql/queries/environment_with_flux_resource.query.graphql
deleted file mode 100644
index 166cd64189f..00000000000
--- a/app/assets/javascripts/environments/graphql/queries/environment_with_flux_resource.query.graphql
+++ /dev/null
@@ -1,16 +0,0 @@
-query getEnvironmentWithFluxResource($projectFullPath: ID!, $environmentName: String) {
-  project(fullPath: $projectFullPath) {
-    id
-    environment(name: $environmentName) {
-      id
-      name
-      externalUrl
-      kubernetesNamespace
-      fluxResourcePath
-      clusterAgent {
-        id
-        name
-      }
-    }
-  }
-}
-- 
cgit v1.2.3