From 862cc0c72d68266d4df81ef643a5478aa60e746f Mon Sep 17 00:00:00 2001
From: tommyd450 <tdalton@redhat.com>
Date: Wed, 13 Nov 2024 10:57:30 +0000
Subject: [PATCH] Adding Ctlog Custom Vars to user-provided molecule setup

---
 molecule/user_provided/vars/vars.yml           | 18 ++++++++++++++++++
 roles/tas_single_node/testdata/cert.pem        | 14 --------------
 roles/tas_single_node/testdata/ctlog-config    |  2 --
 roles/tas_single_node/testdata/private_key.key |  8 --------
 roles/tas_single_node/testdata/public_key.pub  |  4 ----
 5 files changed, 18 insertions(+), 28 deletions(-)
 delete mode 100644 roles/tas_single_node/testdata/cert.pem
 delete mode 100644 roles/tas_single_node/testdata/ctlog-config
 delete mode 100644 roles/tas_single_node/testdata/private_key.key
 delete mode 100644 roles/tas_single_node/testdata/public_key.pub

diff --git a/molecule/user_provided/vars/vars.yml b/molecule/user_provided/vars/vars.yml
index a436f30d..aea5aa8f 100644
--- a/molecule/user_provided/vars/vars.yml
+++ b/molecule/user_provided/vars/vars.yml
@@ -23,3 +23,21 @@ tas_single_node_rekor_redis:
     host: "{{ ansible_default_ipv4.address }}"
     port: 6379
     password: password
+tas_single_node_custom_ctlog_private_key: |
+  -----BEGIN EC PRIVATE KEY-----
+  Proc-Type: 4,ENCRYPTED
+  DEK-Info: DES-EDE3-CBC,88AC4C29A69188C9
+
+  vi9qVLa8vG7dv8N4o+dBUNg8IFZq1wuSOZkWP5Hn4HInrJSm4k+PLNqDL7kyEMAm
+  CoL/niZS+EgfsfYgUj+TEB9f5IrcCO2B5rvHOkR8PmD9Tc86+DfBHDn+GWndStfQ
+  o4JabdBmkeiVHF9G2Yh76WF2bpLdaizhCN9W7sAR1eQ=
+  -----END EC PRIVATE KEY-----
+tas_single_node_custom_ctlog_public_key: |
+  -----BEGIN PUBLIC KEY-----
+  MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6eVbjvymisv1VZYe8bZ5hIsHfhTg
+  nrByohpB1XkB2qS0+DaEY9k3RyORK1NWjCrJ7901l777dBhVM9gYcqAVjw==
+  -----END PUBLIC KEY-----
+tas_single_node_custom_ctlog_config: |
+  backends:{backend:{name:"trillian"  backend_spec:"trillian-logserver-pod:8091"}}
+  log_configs:{config:{log_id:5399108819538606395  prefix:"rhtasansible"  roots_pem_file:"/ctfe-keys/fulcio-0"private_key:{[type.googleapis.com/keyspb.PEMKeyFile]:{path:"/ctfe-keys/private" password:"rhtas"}}  ext_key_usages:"CodeSigning"  log_backend_name:"trillian"}}
+tas_single_node_custom_ctlog_ca_passphrase: "password"
diff --git a/roles/tas_single_node/testdata/cert.pem b/roles/tas_single_node/testdata/cert.pem
deleted file mode 100644
index 474518b7..00000000
--- a/roles/tas_single_node/testdata/cert.pem
+++ /dev/null
@@ -1,14 +0,0 @@
-
------BEGIN CERTIFICATE-----
-MIIB/jCCAaWgAwIBAgIUeDEE2C6xVXWNJswWKShVDCccfPQwCgYIKoZIzj0EAwIw
-VTEgMB4GA1UEAwwXZnVsY2lvLnJodGFzLnJlZGhhdC5jb20xHzAdBgkqhkiG9w0B
-CQEWEHJodGFzQHJlZGhhdC5jb20xEDAOBgNVBAoMB1JlZCBIYXQwHhcNMjQwMzE4
-MTUxMzI5WhcNMjUwMzE4MTUxMzI5WjBVMSAwHgYDVQQDDBdmdWxjaW8ucmh0YXMu
-cmVkaGF0LmNvbTEfMB0GCSqGSIb3DQEJARYQcmh0YXNAcmVkaGF0LmNvbTEQMA4G
-A1UECgwHUmVkIEhhdDBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIOoSE0o6P4W
-z5pSbrrQiJGPdPlZjAqgXPdibWMluWG5hDSaAPhHovEpsJbu8Unxd6aFQhfQOJsf
-8rSqMmwPSO2jUzBRMB0GA1UdDgQWBBSVC7getLczhLQwmCKw1oAAFAC2dDAfBgNV
-HSMEGDAWgBSVC7getLczhLQwmCKw1oAAFAC2dDAPBgNVHRMBAf8EBTADAQH/MAoG
-CCqGSM49BAMCA0cAMEQCIEqF8YPw3Pf+JarQe/Avy4HfFUWDkzUdqGqaI8EO51jw
-AiAxVjWWzYYF2vspXpR7e30hd7bzR5FToxGwd354MuM2bA==
------END CERTIFICATE-----
\ No newline at end of file
diff --git a/roles/tas_single_node/testdata/ctlog-config b/roles/tas_single_node/testdata/ctlog-config
deleted file mode 100644
index 76e9dae4..00000000
--- a/roles/tas_single_node/testdata/ctlog-config
+++ /dev/null
@@ -1,2 +0,0 @@
- backends:{backend:{name:"trillian"  backend_spec:"trillian-logserver-pod:8091"}}
-  log_configs:{config:{log_id:5399108819538606395  prefix:"rhtasansible"  roots_pem_file:"/ctfe-keys/fulcio-0"private_key:{[type.googleapis.com/keyspb.PEMKeyFile]:{path:"/ctfe-keys/private" password:"rhtas"}}  ext_key_usages:"CodeSigning"  log_backend_name:"trillian"}}
\ No newline at end of file
diff --git a/roles/tas_single_node/testdata/private_key.key b/roles/tas_single_node/testdata/private_key.key
deleted file mode 100644
index 9566c233..00000000
--- a/roles/tas_single_node/testdata/private_key.key
+++ /dev/null
@@ -1,8 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-EDE3-CBC,88AC4C29A69188C9
-
-vi9qVLa8vG7dv8N4o+dBUNg8IFZq1wuSOZkWP5Hn4HInrJSm4k+PLNqDL7kyEMAm
-CoL/niZS+EgfsfYgUj+TEB9f5IrcCO2B5rvHOkR8PmD9Tc86+DfBHDn+GWndStfQ
-o4JabdBmkeiVHF9G2Yh76WF2bpLdaizhCN9W7sAR1eQ=
------END EC PRIVATE KEY-----
diff --git a/roles/tas_single_node/testdata/public_key.pub b/roles/tas_single_node/testdata/public_key.pub
deleted file mode 100644
index 99a8f12d..00000000
--- a/roles/tas_single_node/testdata/public_key.pub
+++ /dev/null
@@ -1,4 +0,0 @@
------BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE6eVbjvymisv1VZYe8bZ5hIsHfhTg
-nrByohpB1XkB2qS0+DaEY9k3RyORK1NWjCrJ7901l777dBhVM9gYcqAVjw==
------END PUBLIC KEY-----