From 3c5d958b536f508963af02521e2f7f8d8fce225d Mon Sep 17 00:00:00 2001
From: Mark Boyd <mark.boyd@gsa.gov>
Date: Tue, 5 Sep 2023 11:16:47 -0400
Subject: [PATCH 1/4] update pipeline to use credhub secrets

---
 ci/pipeline.yml | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index f1e15bc..005cfe0 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -6,14 +6,8 @@ jobs:
   - get: src
     params: {depth: 1}
     trigger: true
-  - get: secrets
-    # Remember to manually trigger a new build if you upload a new version
-    # of the credentials file.
-    trigger: false
-  - set_pipeline: ((name))
+  - set_pipeline: opensearch-dashboards-cf-auth-proxy
     file: src/ci/pipeline.yml
-    var_files:
-    - secrets/((name)).yml
 
 - name: test
   plan:
@@ -77,7 +71,7 @@ jobs:
         path: src
         manifest: src/cf/proxy-manifest.yml
         vars:
-          cf_url: ((dev-cf-url))
+          cf_url: ((dev-cf-api-url))
           uaa_auth_url: ((dev-uaa-auth-url))
           uaa_base_url: ((dev-uaa-base-url))
           uaa_client_id: ((dev-uaa-client-id))
@@ -194,14 +188,6 @@ jobs:
 
 resources:
 
-- name: secrets
-  type: s3-iam
-  icon: cloud-lock
-  source:
-    region_name: ((concourse-varz-bucket-region))
-    bucket: ((concourse-varz-bucket))
-    versioned_file: ((name)).yml
-
 - name: src
   type: git
   icon: github-circle
@@ -218,7 +204,7 @@ resources:
     email: ((docker-email))
     username: ((docker-username))
     password: ((docker-password))
-    repository: ((docker-image-opensearch-dev))
+    repository: cloudgovoperations/test-opensearch
 
 - name: dev-opensearch-dashboards-image
   type: docker-image
@@ -227,7 +213,7 @@ resources:
     email: ((docker-email))
     username: ((docker-username))
     password: ((docker-password))
-    repository: ((docker-image-opensearch-dashboards-dev))
+    repository: cloudgovoperations/test-opensearch-dashboards
 
 - name: cf-dev
   type: cf

From 905e82db6a10b871ad92004d6d10ef4eebbca95f Mon Sep 17 00:00:00 2001
From: Mark Boyd <mark.boyd@gsa.gov>
Date: Tue, 5 Sep 2023 11:18:34 -0400
Subject: [PATCH 2/4] remove unnecessary yaml files

---
 ci/init-config.yml       |  7 -------
 ci/pipeline.yml          | 14 ++++++++++++--
 ci/update-networking.yml |  7 -------
 3 files changed, 12 insertions(+), 16 deletions(-)
 delete mode 100644 ci/init-config.yml
 delete mode 100644 ci/update-networking.yml

diff --git a/ci/init-config.yml b/ci/init-config.yml
deleted file mode 100644
index 9459cef..0000000
--- a/ci/init-config.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-platform: linux
-
-inputs:
-- name: src
-
-run:
-  path: src/ci/init-config.sh
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 005cfe0..176a66c 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -82,7 +82,12 @@ jobs:
 
     - task: update-networking
       image: general-task
-      file: src/ci/update-networking.yml
+      config:
+        platform: linux
+        inputs:
+        - name: src
+        run:
+          path: src/ci/update-networking.sh
       params: &dev-cf-auth-params
         CF_API_URL: ((dev-cf-api-url))
         CF_USERNAME: ((dev-cf-username))
@@ -136,7 +141,12 @@ jobs:
 
     - task: initialize-config
       image: general-task
-      file: src/ci/init-config.yml
+      config:
+        platform: linux
+        inputs:
+        - name: src
+        run:
+          path: src/ci/init-config.sh
       params:
         <<: *dev-cf-auth-params
 
diff --git a/ci/update-networking.yml b/ci/update-networking.yml
deleted file mode 100644
index d267cdd..0000000
--- a/ci/update-networking.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-platform: linux
-
-inputs:
-- name: src
-
-run:
-  path: src/ci/update-networking.sh

From b605bbdd6b926b9d5c58fd180521c7c2126f2fca Mon Sep 17 00:00:00 2001
From: Mark Boyd <mark.boyd@gsa.gov>
Date: Tue, 5 Sep 2023 11:28:27 -0400
Subject: [PATCH 3/4] update set_pipeline step

---
 ci/pipeline.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 176a66c..45a0649 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -6,7 +6,7 @@ jobs:
   - get: src
     params: {depth: 1}
     trigger: true
-  - set_pipeline: opensearch-dashboards-cf-auth-proxy
+  - set_pipeline: self
     file: src/ci/pipeline.yml
 
 - name: test

From d4b299bbb6d367f06337393c78352deddf0977b4 Mon Sep 17 00:00:00 2001
From: Mark Boyd <mark.boyd@gsa.gov>
Date: Tue, 5 Sep 2023 11:51:56 -0400
Subject: [PATCH 4/4] use general-task image to run python unit tests

---
 ci/pipeline.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 45a0649..f64740d 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -16,12 +16,8 @@ jobs:
       trigger: true
       passed: [reconfigure]
     - task: test
+      image: general-task
       config:
-        image_resource:
-          type: docker-image
-          source:
-            repository: python
-            tag: "3.8"
         inputs:
           - name: src
         platform: linux