From c0018f3e49e50ebab0ad06ef8789605d5d4cc228 Mon Sep 17 00:00:00 2001
From: nhyatt <nhyatt@smoothnet.org>
Date: Sun, 22 Oct 2023 09:57:38 -0500
Subject: [PATCH] corrects syntax

---
 nordvpn-autoconfigure.jenkins | 89 +++++++++++++++++------------------
 1 file changed, 43 insertions(+), 46 deletions(-)

diff --git a/nordvpn-autoconfigure.jenkins b/nordvpn-autoconfigure.jenkins
index 25a17d2..ba711eb 100644
--- a/nordvpn-autoconfigure.jenkins
+++ b/nordvpn-autoconfigure.jenkins
@@ -39,7 +39,7 @@ pipeline {
             }
         }
 
-        stage ('Prepare Vales') {
+        stage ('Prepare Values') {
             steps {
                 container ('alpine') {
                     retry(3) {
@@ -85,52 +85,50 @@ pipeline {
                                 """
                             }
 
-                                // get OpenVPN Configuration from NordVPN
-                                retry(3) {
-                                    try {
-                                        openVPNConfig = sh(
-                                            returnStdout: true,
-                                            script: """# Get OpenVPN Config
-                                                        curl \
-                                                            --silent \
-                                                            --location \
-                                                            --fail \
-                                                            "https://downloads.nordcdn.com/configs/files/ovpn_tcp/servers/\$(
-                                                                curl \
-                                                                    --silent \
-                                                                    --location \
-                                                                    --fail \
-                                                                    '""" + nordURL + """' \
-                                                                | jq \
-                                                                    --raw-output \
-                                                                    '[.[] | select(.technologies[] | .identifier == "openvpn_tcp")][0] | .hostname' \
-                                                                ).tcp.ovpn" \
-                                                            | sed \
-                                                                --regexp-extended \
-                                                                --expression='s/auth-user-pass/auth-user-pass \\/etc\\/openvpn\\/client\\/openvpn-credentials.txt/' \
-                                                            | base64 -w 0
-                                                    """
-                                        )
-                                    } catch(e) {
-                                        if (openVPNConfig.length() == 0 || openVPNConfig == "") {
-                                            printf("Bad nordURL: %s", nordURL)
-                                            throw e
-                                        }
-                                    }
-                                }
+                            // get OpenVPN Configuration from NordVPN
+                            openVPNConfig = sh(
+                                returnStdout: true,
+                                script: """# Get OpenVPN Config
+                                            curl \
+                                                --silent \
+                                                --location \
+                                                --fail \
+                                                "https://downloads.nordcdn.com/configs/files/ovpn_tcp/servers/\$(
+                                                    curl \
+                                                        --silent \
+                                                        --location \
+                                                        --fail \
+                                                        '""" + nordURL + """' \
+                                                    | jq \
+                                                        --raw-output \
+                                                        '[.[] | select(.technologies[] | .identifier == "openvpn_tcp")][0] | .hostname' \
+                                                    ).tcp.ovpn" \
+                                                | sed \
+                                                    --regexp-extended \
+                                                    --expression='s/auth-user-pass/auth-user-pass \\/etc\\/openvpn\\/client\\/openvpn-credentials.txt/' \
+                                                | base64 -w 0
+                                        """
+                            )
+                        } catch(e) {
+                            if (openVPNConfig.length() == 0 || openVPNConfig == "") {
+                                printf("Bad nordURL: %s", nordURL)
+                                throw e
                             }
                         }
+                    }
+                }
 
-                        withCredentials(
-                            [
-                                string(
-                                    credentialsId: nordCreds,
-                                    variable: "NORD_CREDS",
-                                )
-                            ]
-                        ) {
-
-                        k8sSecret = """apiVersion: v1
+                // Create K8S Secret
+                script {
+                    withCredentials(
+                        [
+                            string(
+                                credentialsId: nordCreds,
+                                variable: "NORD_CREDS",
+                            )
+                        ]
+                    ) {
+                    k8sSecret = """apiVersion: v1
 kind: Secret
 metadata:
   name: """ + kubeSecret + """
@@ -139,13 +137,12 @@ data:
   openvpn-credentials.txt: """ + NORD_CREDS + """
   nordvpn.com.tcp.ovpn: """ + openVPNConfig + """
 """
-                        }
                     }
                 }
             }
         }
 
-        stage ('Create Secret') {
+        stage ('Update Secret') {
             steps {
                 container ('alpine') {
                     script {