INST-12724 - Added azure support to the plugin and changed binary names

Author: RobinDuhan

.github/workflows/build.yml

@@ -55,6 +55,6 @@ jobs:
           draft: false
           prerelease: true
           files: |
-            build/bin/jfrog-credential-provider-aws-linux-amd64
-            build/bin/jfrog-credential-provider-aws-linux-arm64
+            build/bin/jfrog-credential-provider-linux-amd64
+            build/bin/jfrog-credential-provider-linux-arm64
           fail_on_unmatched_files: true 

.github/workflows/release.yml

@@ -41,17 +41,17 @@ jobs:
       - name: Sign Binaries
         run: |
           cd build/bin/
-          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --detach-sign --armor jfrog-credential-provider-aws-linux-amd64
-          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --detach-sign --armor jfrog-credential-provider-aws-linux-arm64
+          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --detach-sign --armor jfrog-credential-provider-linux-amd64
+          echo "${{ secrets.GPG_PASSPHRASE }}" | gpg --batch --yes --pinentry-mode loopback --passphrase-fd 0 --detach-sign --armor jfrog-credential-provider-linux-arm64
 
       - name: Upload release artifacts
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.event.inputs.tag }}
           generate_release_notes: true
           files: |
-            build/bin/jfrog-credential-provider-aws-linux-amd64
-            build/bin/jfrog-credential-provider-aws-linux-arm64
-            build/bin/jfrog-credential-provider-aws-linux-amd64.asc
-            build/bin/jfrog-credential-provider-aws-linux-arm64.asc
+            build/bin/jfrog-credential-provider-linux-amd64
+            build/bin/jfrog-credential-provider-linux-arm64
+            build/bin/jfrog-credential-provider-linux-amd64.asc
+            build/bin/jfrog-credential-provider-linux-arm64.asc
     

internal/autoupdate/fetch.go

@@ -184,7 +184,7 @@ func downloadLatestBinary(ctx context.Context, logs *logger.Logger, client *http
 		logs.Info("Release tag '%s' is missing 'v' prefix. Prepending 'v'." + newVersion)
 		newVersion = strings.TrimPrefix(newVersion, "v")
 	}
-	downloadUrl := jfrogPluginDownloadUrl + downloadSuffix + newVersion + "/jfrog-credential-provider-aws-linux-" + getArchSuffix(logs)
+	downloadUrl := jfrogPluginDownloadUrl + downloadSuffix + newVersion + "/jfrog-credential-provider-linux-" + getArchSuffix(logs)
 	logs.Info("Downloading new binary from: " + downloadUrl)
 	downloadSignUrl := downloadUrl + ".asc"
 	err := downloadReleaseArtifacts(ctx, logs, client, newBinaryPath, downloadUrl)

internal/handlers/aws.go

@@ -399,6 +399,7 @@ func getResourceServerId(s *service.Service, cfg aws.Config, userPoolName string
 }
 
 func CheckIfAWS(s *service.Service, ctx context.Context) (bool, error) {
+	s.Logger.Info("Checking if cloud provider is AWS")
 	req, err := http.NewRequestWithContext(ctx, "GET", METADATA_URL, nil)
 	if err != nil {
 		return false, fmt.Errorf("Error creating request to check if cloud provider is AWS: %v", err)
@@ -408,5 +409,6 @@ func CheckIfAWS(s *service.Service, ctx context.Context) (bool, error) {
 		return false, fmt.Errorf("Error checking if cloud provider is AWS: %v", err)
 	}
 	defer resp.Body.Close()
+	s.Logger.Info(fmt.Sprintf("AWS metadata server response status code: %d", resp.StatusCode))
 	return (resp.StatusCode == http.StatusOK), nil
 }

internal/handlers/azure.go

@@ -15,7 +15,6 @@
 package handlers
 
 import (
-	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
@@ -153,22 +152,17 @@ func GetAzureOIDCToken(s *service.Service, ctx context.Context,
 }
 
 func CheckIfAzure(s *service.Service, ctx context.Context) (bool, error) {
-	body, err := json.Marshal(map[string]string{
-		"Metadata": "true",
-	})
-	if err != nil {
-		return false, fmt.Errorf("Error marshaling request body: %v", err)
-	}
-
-	req, err := http.NewRequestWithContext(ctx, "GET", AZURE_METADATA_URL, bytes.NewBuffer(body))
+	s.Logger.Info("Checking if cloud provider is Azure")
+	req, err := http.NewRequestWithContext(ctx, "GET", AZURE_METADATA_URL, nil)
 	if err != nil {
 		return false, fmt.Errorf("Error creating request to check if cloud provider is Azure: %v", err)
 	}
+	req.Header.Add("Metadata", "true")
 	resp, err := s.Client.Do(req)
 	if err != nil {
 		return false, fmt.Errorf("Error checking if cloud provider is Azure: %v", err)
 	}
 	defer resp.Body.Close()
-
+	s.Logger.Info(fmt.Sprintf("Azure metadata server response status code: %d", resp.StatusCode))
 	return (resp.StatusCode == http.StatusOK), nil
 }