added playground tools certs-create

vdesabou · Dec 9, 2024 · bd62c1b · bd62c1b
1 parent 5c491d5
commit bd62c1b
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 283 deletions.
diff --git a/ccloud/fm-mqtt-source/fully-managed-mqtt-source-mtls.sh b/ccloud/fm-mqtt-source/fully-managed-mqtt-source-mtls.sh
@@ -4,12 +4,11 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 source ${DIR}/../../scripts/utils.sh
 
-cd ${DIR}/security
-log "🔐 Generate keys and certificates used for SSL"
-docker run -u0 --rm -v $PWD:/tmp ${CP_CONNECT_IMAGE}:${CONNECT_TAG} bash -c "/tmp/certs-create.sh > /dev/null 2>&1 && chown -R $(id -u $USER):$(id -g $USER) /tmp/ && chmod a+r /tmp/*"
+cd ../../ccloud/fm-mqtt-source/security
+playground tools certs-create --output-folder "$PWD" --container connect --container mosquitto --verbose
 base64_truststore=$(cat $PWD/kafka.connect.truststore.jks | base64 | tr -d '\n')
 base64_keystore=$(cat $PWD/kafka.connect.keystore.jks | base64 | tr -d '\n')
-cd ${DIR}
+cd -
 
 NGROK_AUTH_TOKEN=${NGROK_AUTH_TOKEN:-$1}
 

diff --git a/ccloud/fm-mqtt-source/security/certs-create.sh b/ccloud/fm-mqtt-source/security/certs-create.sh
diff --git a/ccloud/fm-rabbitmq-sink/fully-managed-rabbitmq-sink-ssl.sh b/ccloud/fm-rabbitmq-sink/fully-managed-rabbitmq-sink-ssl.sh
@@ -6,8 +6,9 @@ source ${DIR}/../../scripts/utils.sh
 NGROK_AUTH_TOKEN=${NGROK_AUTH_TOKEN:-$1}
 
 cd ../../ccloud/fm-rabbitmq-sink/security
-log "🔐 Generate keys and certificates used for SSL"
-docker run -u0 --rm -v $PWD:/tmp ${CP_CONNECT_IMAGE}:${CONNECT_TAG} bash -c "/tmp/certs-create.sh > /dev/null 2>&1 && chown -R $(id -u $USER):$(id -g $USER) /tmp/ && chmod a+r /tmp/*"
+playground tools certs-create --output-folder "$PWD" --container connect --container rabbitmq
+base64_truststore=$(cat $PWD/kafka.connect.truststore.jks | base64 | tr -d '\n')
+base64_keystore=$(cat $PWD/kafka.connect.keystore.jks | base64 | tr -d '\n')
 cd -
 
 display_ngrok_warning
@@ -72,9 +73,6 @@ set +e
 playground connector delete --connector $connector_name > /dev/null 2>&1
 set -e
 
-base64_truststore=$(cat $PWD/security/kafka.connect.truststore.jks | base64 | tr -d '\n')
-base64_keystore=$(cat $PWD/security/kafka.connect.keystore.jks | base64 | tr -d '\n')
-
 log "Creating fully managed connector"
 playground connector create-or-update --connector $connector_name << EOF
 {

diff --git a/ccloud/fm-rabbitmq-sink/security/certs-create.sh b/ccloud/fm-rabbitmq-sink/security/certs-create.sh
diff --git a/ccloud/fm-rabbitmq-source/fully-managed-rabbitmq-source-ssl.sh b/ccloud/fm-rabbitmq-source/fully-managed-rabbitmq-source-ssl.sh
@@ -4,10 +4,10 @@ set -e
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 source ${DIR}/../../scripts/utils.sh
 
-
 cd ../../ccloud/fm-rabbitmq-source/security
-log "🔐 Generate keys and certificates used for SSL"
-docker run -u0 --rm -v $PWD:/tmp ${CP_CONNECT_IMAGE}:${CONNECT_TAG} bash -c "/tmp/certs-create.sh > /dev/null 2>&1 && chown -R $(id -u $USER):$(id -g $USER) /tmp/ && chmod a+r /tmp/*"
+playground tools certs-create --output-folder "$PWD" --container connect --container rabbitmq
+base64_truststore=$(cat $PWD/kafka.connect.truststore.jks | base64 | tr -d '\n')
+base64_keystore=$(cat $PWD/kafka.connect.keystore.jks | base64 | tr -d '\n')
 cd -
 
 NGROK_AUTH_TOKEN=${NGROK_AUTH_TOKEN:-$1}
@@ -61,9 +61,6 @@ sleep 6
 log "Send message to RabbitMQ in myqueue"
 docker exec rabbitmq_producer bash -c "python /producer.py myqueue 5"
 
-base64_truststore=$(cat $PWD/security/kafka.connect.truststore.jks | base64 | tr -d '\n')
-base64_keystore=$(cat $PWD/security/kafka.connect.keystore.jks | base64 | tr -d '\n')
-
 log "Creating fully managed connector"
 playground connector create-or-update --connector $connector_name << EOF
 {

diff --git a/ccloud/rest-proxy-security-plugin/security/certs-clean.sh b/ccloud/rest-proxy-security-plugin/security/certs-clean.sh
diff --git a/ccloud/rest-proxy-security-plugin/security/certs-create.sh b/ccloud/rest-proxy-security-plugin/security/certs-create.sh
diff --git a/ccloud/rest-proxy-security-plugin/security/certs-verify.sh b/ccloud/rest-proxy-security-plugin/security/certs-verify.sh
diff --git a/ccloud/rest-proxy-security-plugin/start.sh b/ccloud/rest-proxy-security-plugin/start.sh
@@ -32,10 +32,9 @@ sed -e "s|:CCLOUD_REST_PROXY_SECURITY_PLUGIN_API_KEY:|$CCLOUD_REST_PROXY_SECURIT
     -e "s|:CCLOUD_REST_PROXY_SECURITY_PLUGIN_API_SECRET:|$CCLOUD_REST_PROXY_SECURITY_PLUGIN_API_SECRET|g" \
     ../../ccloud/rest-proxy-security-plugin/kafka-rest.jaas-template.conf > ../../ccloud/rest-proxy-security-plugin/kafka-rest.jaas.conf
 
-cd ${DIR}/security
-log "🔐 Generate keys and certificates used for SSL"
-docker run -u0 --rm -v $PWD:/tmp ${CP_CONNECT_IMAGE}:${CONNECT_TAG} bash -c "/tmp/certs-create.sh > /dev/null 2>&1 $CCLOUD_REST_PROXY_SECURITY_PLUGIN_API_KEY && chown -R $(id -u $USER):$(id -g $USER) /tmp/"
-cd ${DIR}
+cd ../../ccloud/rest-proxy-security-plugin/security
+playground tools certs-create --output-folder "$PWD" --container restproxy --container $CCLOUD_REST_PROXY_SECURITY_PLUGIN_API_KEY --verbose
+cd -
 
 docker compose -f "${PWD}/docker-compose.yml" up -d --quiet-pull