Making scripts directory a string template

deploy/cicd/Dockerfile-osctrl-tls

@@ -6,10 +6,9 @@ ARG GOARCH
 
 RUN useradd -ms /usr/sbin/nologin osctrl-${COMPONENT}
 RUN mkdir -p /opt/osctrl/bin
-RUN mkdir -p /opt/osctrl/scripts
 RUN mkdir -p /opt/osctrl/config
 COPY osctrl-${COMPONENT}-${GOOS}-${GOARCH}.bin /opt/osctrl/bin/osctrl-${COMPONENT}
 USER osctrl-${COMPONENT}
 WORKDIR /opt/osctrl
 EXPOSE 9000/tcp
-CMD ["/opt/osctrl/bin/osctrl-tls"]
+CMD ["/opt/osctrl/bin/osctrl-tls"]

deploy/docker/.air-osctrl-tls.toml

@@ -17,7 +17,7 @@ tmp_dir = "bin"
   follow_symlink = false
   full_bin = "./bin/osctrl-tls"
   include_dir = []
-  include_ext = ["go", "ps1", "sh"]
+  include_ext = ["go"]
   kill_delay = "0s"
   log = "build-errors.log"
   send_interrupt = false

deploy/docker/Dockerfile-osctrl-dev

@@ -17,14 +17,12 @@ RUN useradd -ms /bin/bash osctrl-tls
 ### Copy osctrl-tls bin and configs ###
 RUN mkdir -p /opt/osctrl/
 RUN mkdir -p /opt/osctrl/bin
-RUN mkdir -p /opt/osctrl/scripts
 RUN mkdir -p /opt/osctrl/config
 
 ### Compile osctrl-tls bin ###
 RUN go build -o /opt/osctrl/bin/osctrl-tls tls/*.go
 RUN go build -o /opt/osctrl/bin/osctrl-cli cli/*.go
 
-COPY tls/scripts/ /opt/osctrl/scripts
 COPY deploy/docker/conf/osctrl/tls/tls.json /opt/osctrl/config/tls.json
 COPY deploy/docker/conf/osctrl/db.json /opt/osctrl/config/db.json
 RUN sed -i "s#{{ POSTGRES_DB_NAME }}#${POSTGRES_DB_NAME}#g" /opt/osctrl/config/db.json

deploy/docker/Dockerfile-osctrl-prod

@@ -36,10 +36,8 @@ RUN useradd -ms /bin/bash osctrl-tls
 
 ### Copy osctrl-tls bin and configs ###
 RUN mkdir -p /opt/osctrl/bin
-RUN mkdir -p /opt/osctrl/scripts
 RUN mkdir -p /opt/osctrl/config
 COPY --from=osctrl-base /go/src/osctrl/bin/osctrl-tls /opt/osctrl/bin/osctrl-tls
-COPY --from=osctrl-base /go/src/osctrl/tls/scripts/ /opt/osctrl/scripts
 COPY deploy/docker/conf/osctrl/tls/tls.json /opt/osctrl/config/tls.json
 COPY deploy/docker/conf/osctrl/db.json /opt/osctrl/config/db.json
 RUN sed -i "s#{{ POSTGRES_DB_NAME }}#${POSTGRES_DB_NAME}#g" /opt/osctrl/config/db.json

deploy/provision.sh

@@ -443,9 +443,6 @@ if [[ "$UPGRADE" == true ]]; then
     # Build TLS service
     make tls
 
-    # Prepare static files for TLS service
-    _static_files "$MODE" "$SOURCE_PATH" "$DEST_PATH" "tls/scripts" "scripts"
-
     # Restart service with new binary
     make install_tls
   fi
@@ -669,9 +666,6 @@ else
     # Configuration file generation for TLS service
     configuration_service "$SOURCE_PATH/deploy/config/$SERVICE_TEMPLATE" "$DEST_PATH/config/$TLS_CONF" "$_T_HOST|$_T_INT_PORT" "$TLS_COMPONENT" "127.0.0.1" "$_T_AUTH" "$_T_LOGGING" "sudo"
 
-    # Prepare static files for TLS service
-    _static_files "$MODE" "$SOURCE_PATH" "$DEST_PATH" "tls/scripts" "scripts"
-
     # Systemd configuration for TLS service
     _systemd "osctrl" "osctrl" "osctrl-tls" "$SOURCE_PATH" "$DEST_PATH"
   fi

environments/oneliners.go

@@ -101,24 +101,24 @@ iex ((New-Object System.Net.WebClient).DownloadString('https://{{ .TLSHost }}/{{
 
 // QuickAddScript to get a quick add script for a environment
 func QuickAddScript(project, script string, environment TLSEnvironment) (string, error) {
-	var templateName, templatePath string
+	var templateName, templateScript string
 	// What script is it?
 	switch script {
 	case EnrollShell:
 		templateName = "quick-add.sh"
-		templatePath = "scripts/quick-add.sh"
+		templateScript = QuickAddScriptShell
 	case EnrollPowershell:
 		templateName = "quick-add.ps1"
-		templatePath = "scripts/quick-add.ps1"
+		templateScript = QuickAddScriptPowershell
 	case RemoveShell:
 		templateName = "quick-remove.sh"
-		templatePath = "scripts/quick-remove.sh"
+		templateScript = QuickRemoveScriptShell
 	case RemovePowershell:
 		templateName = "quick-remove.ps1"
-		templatePath = "scripts/quick-remove.ps1"
+		templateScript = QuickRemoveScriptPowershell
 	}
 	// Prepare template
-	t, err := template.New(templateName).ParseFiles(templatePath)
+	t, err := template.New(templateName).Parse(templateScript)
 	if err != nil {
 		return "", err
 	}