updated op output ids (#1043)

src/Nuke/GithubActions/GitHubActionsStepsAttribute.cs

@@ -128,7 +128,7 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
             secrets = secrets
                      .Concat(
                           onePasswordServiceAccountSecrets
-                             .Select(z => z.Secret ?? "OP_SERVICE_ACCOUNT_TOKEN")
+                             .Select(z => z.Secret)
                              .Distinct()
                              .Select(z => new GitHubActionsSecret(z))
                       )
@@ -145,11 +145,11 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
 
             steps.AddRange(
                 onePasswordServiceAccountSecrets
-                   .GroupBy(z => z.Secret ?? "OP_SERVICE_ACCOUNT_TOKEN")
+                   .GroupBy(z => z.GroupByKey)
                    .Select(
                         static secrets => new UsingStep($"Load 1Password Secrets ({secrets.Key})")
                                           {
-                                              Id = "1password",
+                                              Id = secrets.First().OutputId,
                                               Uses = "1password/load-secrets-action@v1",
                                               Outputs = secrets
                                                        .Select(secret => new GitHubActionsOutput(secret.Name, secret.Description))
@@ -167,7 +167,7 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
                                                                 [
                                                                     new KeyValuePair<string, string>(
                                                                         "OP_SERVICE_ACCOUNT_TOKEN",
-                                                                        $$$"""${{ secrets.{{{secrets.Key}}} }}"""
+                                                                        $$$"""${{ secrets.{{{secrets.First().OutputId}}} }}"""
                                                                     ),
                                                                 ]
                                                             )
@@ -182,7 +182,7 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
             secrets = secrets
                      .Concat(
                           onePasswordConnectServerSecrets
-                             .Select(z => z.ConnectToken ?? "OP_CONNECT_TOKEN")
+                             .Select(z => z.ConnectToken)
                              .Distinct()
                              .Select(z => new GitHubActionsSecret(z))
                       )
@@ -191,7 +191,7 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
             variables = variables
                        .Concat(
                             onePasswordConnectServerSecrets
-                               .Select(z => z.ConnectHost ?? "OP_CONNECT_HOST")
+                               .Select(z => z.ConnectHost)
                                .Distinct()
                                .Select(z => new GitHubActionsVariable(z))
                         )
@@ -205,11 +205,11 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
 
             steps.AddRange(
                 onePasswordConnectServerSecrets
-                   .GroupBy(z => ( Host: z.ConnectHost ?? "OP_CONNECT_HOST", Token: z.ConnectToken ?? "OP_CONNECT_TOKEN" ))
+                   .GroupBy(z => z.GroupByKey)
                    .Select(
-                        static secrets => new UsingStep($"Load 1Password Secrets {secrets.Key}")
+                        static secrets => new UsingStep($"Load 1Password Secrets ({secrets.Key})")
                                           {
-                                              Id = "1password",
+                                              Id = secrets.First().OutputId,
                                               Uses = "1password/load-secrets-action@v1",
                                               Outputs = secrets
                                                        .Select(secret => new GitHubActionsOutput(secret.Name, secret.Description))
@@ -227,11 +227,11 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
                                                                 [
                                                                     new(
                                                                         "OP_CONNECT_HOST",
-                                                                        $$$"""${{ vars.{{{secrets.Key.Host}}} }}"""
+                                                                        $$$"""${{ vars.{{{secrets.First().ConnectHost}}} }}"""
                                                                     ),
                                                                     new KeyValuePair<string, string>(
                                                                         "OP_CONNECT_TOKEN",
-                                                                        $$$"""${{ secrets.{{{secrets.Key.Token}}} }}"""
+                                                                        $$$"""${{ secrets.{{{secrets.First().ConnectToken}}} }}"""
                                                                     ),
                                                                 ]
                                                             )

src/Nuke/GithubActions/OnePasswordConnectServerSecret.cs

@@ -1,3 +1,6 @@
+using System.Security.Cryptography;
+using System.Text;
+
 namespace Rocket.Surgery.Nuke.GithubActions;
 
 /// <summary>
@@ -8,18 +11,34 @@ namespace Rocket.Surgery.Nuke.GithubActions;
 /// <param name="Description"></param>
 /// <param name="Alias">An alias for use with parameter attributes</param>
 /// <param name="Variable">The GitHub variable to item path part for the op reference (eg. op://vault/item)</param>
-/// <param name="Secret">The secret where the OP_SERVICE_ACCOUNT_TOKEN is stored (defaults to OP_SERVICE_ACCOUNT_TOKEN)</param>
+/// <param name="ConnectHost">The Connect Server Host (defaults to OP_CONNECT_HOST)</param>
+/// <param name="ConnectToken">The Connect Server Token (defaults to OP_CONNECT_TOKEN)</param>
 public record OnePasswordConnectServerSecret
 (
     string Path,
     string Name,
     string? Description = null,
     string? Alias = null,
     string? Variable = null,
-    string? ConnectHost = null,
-    string? ConnectToken = null) : ITriggerValue
+    string ConnectHost = "OP_CONNECT_HOST",
+    string ConnectToken = "OP_CONNECT_TOKEN") : ITriggerValue
 {
-    public string Prefix => "steps.1password.outputs";
+    private static string HashId(string value)
+    {
+        var data = SHA256.HashData(Encoding.UTF8.GetBytes(value));
+        // data to a set of hex strings
+        var sBuilder = new StringBuilder();
+        foreach (var t in data)
+        {
+            sBuilder.Append(t.ToString("x2"));
+        }
+
+        return sBuilder.ToString()[..8];
+    }
+
+    public string GroupByKey = $"{ConnectHost}, {ConnectToken}";
+    public string OutputId => $"1password-{HashId(ConnectHost + ConnectToken)}";
+    public string Prefix => $"steps.{OutputId}.outputs";
 
     public string? Default => null;
 }

src/Nuke/GithubActions/OnePasswordConnectServerSecretAttribute.cs

@@ -67,8 +67,8 @@ public OnePasswordConnectServerSecret ToSecret()
             Description,
             Alias,
             Variable,
-            ConnectHost,
-            ConnectToken
+            ConnectHost ?? "OP_CONNECT_HOST",
+            ConnectToken ?? "OP_CONNECT_TOKEN"
         );
     }
 }

src/Nuke/GithubActions/OnePasswordSecretAttribute.cs

@@ -96,7 +96,7 @@ public string? ConnectToken
     ///     Convert to a secret
     /// </summary>
     /// <returns></returns>
-    public ITriggerValue ToSecret()
+    internal ITriggerValue ToSecret()
     {
         if (UseConnectServer)
         {
@@ -106,8 +106,8 @@ public ITriggerValue ToSecret()
                 Description,
                 Alias,
                 Variable,
-                ConnectHost,
-                connectToken
+                ConnectHost ?? "OP_CONNECT_HOST",
+                ConnectToken ?? "OP_CONNECT_TOKEN"
             );
         }
 
@@ -117,7 +117,7 @@ public ITriggerValue ToSecret()
             Description,
             Alias,
             Variable,
-            Secret
+            Secret ?? "OP_SERVICE_ACCOUNT_TOKEN"
         );
     }
 }

src/Nuke/GithubActions/OnePasswordServiceAccountSecret.cs

@@ -1,3 +1,6 @@
+using System.Security.Cryptography;
+using System.Text;
+
 namespace Rocket.Surgery.Nuke.GithubActions;
 
 /// <summary>
@@ -16,9 +19,25 @@ public record OnePasswordServiceAccountSecret
     string? Description = null,
     string? Alias = null,
     string? Variable = null,
-    string? Secret = null) : ITriggerValue
+    string Secret = "OP_SERVICE_ACCOUNT_TOKEN") : ITriggerValue
 {
-    public string Prefix => "steps.1password.outputs";
+    private static string HashId(string value)
+    {
+        var data = SHA256.HashData(Encoding.UTF8.GetBytes(value));
+        // data to a set of hex strings
+        var sBuilder = new StringBuilder();
+        foreach (var t in data)
+        {
+            sBuilder.Append(t.ToString("x2"));
+        }
+
+        return sBuilder.ToString()[..8];
+    }
+
+    public string GroupByKey = Secret;
+    public string OutputId => $"1password-{HashId(Secret)}";
+    public string Prefix => $"steps.{OutputId}.outputs";
+
 
     public string? Default => null;
 }

src/Nuke/GithubActions/OnePasswordServiceAccountSecretAttribute.cs

@@ -57,7 +57,7 @@ public OnePasswordServiceAccountSecret ToSecret()
             Description,
             Alias,
             Variable,
-            Secret
+            Secret ?? "OP_SERVICE_ACCOUNT_TOKEN"
         );
     }
 }

src/Nuke/PublicAPI.Shipped.txt

@@ -427,16 +427,18 @@ Rocket.Surgery.Nuke.GithubActions.ITriggerValue.Prefix.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Alias.get -> string?
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Alias.init -> void
-Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.ConnectHost.get -> string?
+Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.ConnectHost.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.ConnectHost.init -> void
-Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.ConnectToken.get -> string?
+Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.ConnectToken.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.ConnectToken.init -> void
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Default.get -> string?
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Description.get -> string?
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Description.init -> void
+Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.GroupByKey -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Name.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Name.init -> void
-Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.OnePasswordConnectServerSecret(string! Path, string! Name, string? Description = null, string? Alias = null, string? Variable = null, string? ConnectHost = null, string? ConnectToken = null) -> void
+Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.OnePasswordConnectServerSecret(string! Path, string! Name, string? Description = null, string? Alias = null, string? Variable = null, string! ConnectHost = "OP_CONNECT_HOST", string! ConnectToken = "OP_CONNECT_TOKEN") -> void
+Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.OutputId.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Path.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Path.init -> void
 Rocket.Surgery.Nuke.GithubActions.OnePasswordConnectServerSecret.Prefix.get -> string!
@@ -478,7 +480,6 @@ Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.OnePasswordSecretAt
 Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.Path.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.Secret.get -> string?
 Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.Secret.set -> void
-Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.ToSecret() -> Rocket.Surgery.Nuke.GithubActions.ITriggerValue!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.UseConnectServer.get -> bool
 Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.UseConnectServer.set -> void
 Rocket.Surgery.Nuke.GithubActions.OnePasswordSecretAttribute.UseServiceAccount.get -> bool
@@ -490,13 +491,15 @@ Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Alias.init ->
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Default.get -> string?
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Description.get -> string?
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Description.init -> void
+Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.GroupByKey -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Name.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Name.init -> void
-Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.OnePasswordServiceAccountSecret(string! Path, string! Name, string? Description = null, string? Alias = null, string? Variable = null, string? Secret = null) -> void
+Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.OnePasswordServiceAccountSecret(string! Path, string! Name, string? Description = null, string? Alias = null, string? Variable = null, string! Secret = "OP_SERVICE_ACCOUNT_TOKEN") -> void
+Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.OutputId.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Path.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Path.init -> void
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Prefix.get -> string!
-Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Secret.get -> string?
+Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Secret.get -> string!
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Secret.init -> void
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Variable.get -> string?
 Rocket.Surgery.Nuke.GithubActions.OnePasswordServiceAccountSecret.Variable.init -> void