fix(ci): e2e workflow should be fully reusable

.github/workflows/ci.yaml

@@ -53,7 +53,7 @@ jobs:
     name: e2e tests
     runs-on: ubuntu-latest
     steps:
-      - uses: opentdf/otdfctl/e2e@feat/e2e-ci
+      - uses: opentdf/otdfctl/e2e@main
         with:
           platform-ref: 'main'
           otdfctl-ref: ${{ github.event.pull_request.head.sha }}

cmd/kas-grants.go

@@ -185,38 +185,38 @@ func policy_listKasGrants(cmd *cobra.Command, args []string) {
 	rows := []table.Row{}
 	t := cli.NewTable(
 		// columns should be kas id, kas uri, type, id, fqn
-		table.NewFlexColumn("kas_id", "KAS ID", 3),
-		table.NewFlexColumn("kas_uri", "KAS URI", 3),
-		table.NewFlexColumn("grant_type", "Assigned To", 1),
-		table.NewFlexColumn("id", "Granted Object ID", 3),
-		table.NewFlexColumn("fqn", "Granted Object FQN", 3),
+		table.NewFlexColumn("kas_id", "KAS ID", cli.FlexColumnWidthThree),
+		table.NewFlexColumn("kas_uri", "KAS URI", cli.FlexColumnWidthThree),
+		table.NewFlexColumn("grant_type", "Assigned To", cli.FlexColumnWidthOne),
+		table.NewFlexColumn("id", "Granted Object ID", cli.FlexColumnWidthThree),
+		table.NewFlexColumn("fqn", "Granted Object FQN", cli.FlexColumnWidthThree),
 	)
 
 	for _, g := range grants {
-		kasID := g.GetKeyAccessServer().GetId()
-		kasURI := g.GetKeyAccessServer().GetUri()
+		grantedKasID := g.GetKeyAccessServer().GetId()
+		grantedKasURI := g.GetKeyAccessServer().GetUri()
 		for _, ag := range g.GetAttributeGrants() {
 			rows = append(rows, table.NewRow(table.RowData{
-				"kas_id":     kasID,
-				"kas_uri":    kasURI,
+				"kas_id":     grantedKasID,
+				"kas_uri":    grantedKasURI,
 				"grant_type": "Definition",
 				"id":         ag.GetId(),
 				"fqn":        ag.GetFqn(),
 			}))
 		}
 		for _, vg := range g.GetValueGrants() {
 			rows = append(rows, table.NewRow(table.RowData{
-				"kas_id":     kasID,
-				"kas_uri":    kasURI,
+				"kas_id":     grantedKasID,
+				"kas_uri":    grantedKasURI,
 				"grant_type": "Value",
 				"id":         vg.GetId(),
 				"fqn":        vg.GetFqn(),
 			}))
 		}
 		for _, ng := range g.GetNamespaceGrants() {
 			rows = append(rows, table.NewRow(table.RowData{
-				"kas_id":     kasID,
-				"kas_uri":    kasURI,
+				"kas_id":     grantedKasID,
+				"kas_uri":    grantedKasURI,
 				"grant_type": "Namespace",
 				"id":         ng.GetId(),
 				"fqn":        ng.GetFqn(),

e2e/action.yaml

@@ -24,21 +24,13 @@ runs:
         if [ ${{ inputs.platform-is-running }} == 'true' ]; then
           echo "Platform is already running"
         else
-          if [ "${{ inputs.platform-ref }}" == "" ]; then
-            echo "Platform will be spun up from 'main'"
-          else
             echo "Platform will be checked out at '${{ inputs.platform-ref }}' and spun up"
-          fi
-        fi
-
-        if [ ${{ inputs.otdfctl-ref == github.event.pull_request.head.sha }} ]; then
-          echo "otdfctl will be tested from the PR branch"
-        else
-          echo "otdfctl will be tested from 'main' or '${{ inputs.otdfctl-ref }}'"
         fi
+        echo "Testing otdfctl CLI from '${{ inputs.otdfctl-ref }}'"
     - name: Check out otdfctl CLI
       uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
       with:
+        repository: opentdf/otdfctl
         ref: ${{ inputs.otdfctl-ref }}
         path: otdfctl
       # Spin up the platform IFF it's not already running in the current workflow context
@@ -109,7 +101,7 @@ runs:
       if: steps.setup-go.outcome != 'success'
       uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7
       with:
-        go-version-file: go.mod
+        go-version-file: otdfctl/go.mod
     - name: Build the CLI
       shell: bash
       run: go build .

pkg/handlers/nano-tdf.go

@@ -42,7 +42,3 @@ func (h Handler) DecryptNanoTDF(toDecrypt []byte) (*bytes.Buffer, error) {
 	}
 	return &outBuf, nil
 }
-
-func trigger() {
-	return
-}