Merge pull request #49 from VinozzZ/update-porter-to-rc.2

update to porter v1.0.0-rc.2

Author: VinozzZ

Makefile

@@ -10,30 +10,24 @@ trigger:
       - refs/tags/v*
 
 pool:
-  vmImage: 'Ubuntu 16.04'
+  vmImage: 'ubuntu-latest'
 
 steps:
 - task: GoTool@0
   inputs:
-    version: '1.13.10'
+    version: '1.18.6'
   displayName: 'Install Go'
 
-- script: |
-    set -xeuo pipefail
-    mkdir -p /home/vsts/go/bin/
-    echo "##vso[task.prependpath]/home/vsts/go/bin/"
-  displayName: 'Configure Go'
+- script: go run mage.go ConfigureAgent
+  displayName: 'Configure Agent'
 
-- script: |
-    make build test
-  displayName: 'Unit Test'
+- script: mage Test
+  displayName: 'Test'
 
-- script: |
-    make xbuild-all
+- script: mage XBuildAll
   displayName: 'Cross Compile'
 
-- script: |
-    make publish
+- script: mage Publish
   env:
     GITHUB_TOKEN: $(GITHUB_TOKEN)
   displayName: 'Publish'

azure-pipelines.yml

@@ -10,7 +10,7 @@ func buildBuildCommand(m *arm.Mixin) *cobra.Command {
 		Use:   "build",
 		Short: "Generate Dockerfile lines for the bundle invocation image",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return m.Build()
+			return m.Build(cmd.Context())
 		},
 	}
 	return cmd

cmd/arm/build.go

@@ -17,7 +17,7 @@ func buildInstallCommand(m *arm.Mixin) *cobra.Command {
 			return m.LoadConfigFromEnvironment()
 		},
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return m.Install()
+			return m.Install(cmd.Context())
 		},
 	}
 	return cmd

cmd/arm/install.go

@@ -1,50 +1,75 @@
 package main
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"os"
+	"runtime/debug"
 
 	"get.porter.sh/mixin/arm/pkg/arm"
+	"get.porter.sh/porter/pkg/cli"
 	"github.com/spf13/cobra"
+	"go.opentelemetry.io/otel/attribute"
 )
 
 func main() {
-	cmd, err := buildRootCommand(os.Stdin)
-	if err != nil {
-		fmt.Printf("err: %s\n", err)
-		os.Exit(1)
-	}
-	if err := cmd.Execute(); err != nil {
-		fmt.Printf("err: %s\n", err)
-		os.Exit(1)
+	run := func() int {
+		ctx := context.Background()
+		m := arm.New()
+		if err := m.ConfigureLogging(ctx); err != nil {
+			fmt.Println(err)
+			os.Exit(cli.ExitCodeErr)
+		}
+		cmd := buildRootCommand(m, os.Stdin)
+
+		// We don't have tracing working inside a bundle working currently.
+		// We are using StartRootSpan anyway because it creates a TraceLogger and sets it
+		// on the context, so we can grab it later
+		ctx, log := m.StartRootSpan(ctx, "arm")
+		defer func() {
+			// Capture panics and trace them
+			if panicErr := recover(); panicErr != nil {
+				log.Error(fmt.Errorf("%s", panicErr),
+					attribute.Bool("panic", true),
+					attribute.String("stackTrace", string(debug.Stack())))
+				log.EndSpan()
+				m.Close()
+				os.Exit(cli.ExitCodeErr)
+			} else {
+				log.Close()
+				m.Close()
+			}
+		}()
+
+		if err := cmd.ExecuteContext(ctx); err != nil {
+			return cli.ExitCodeErr
+		}
+		return cli.ExitCodeSuccess
 	}
+	os.Exit(run())
 }
 
-func buildRootCommand(in io.Reader) (*cobra.Command, error) {
-	m, err := arm.New()
-	if err != nil {
-		return nil, err
-	}
-	m.In = in
+func buildRootCommand(m *arm.Mixin, in io.Reader) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:  "arm",
 		Long: "An ARM mixin for porter 👩🏽‍✈️",
 		PersistentPreRun: func(cmd *cobra.Command, args []string) {
 			// Enable swapping out stdout/stderr for testing
+			m.In = in
 			m.Out = cmd.OutOrStdout()
 			m.Err = cmd.OutOrStderr()
 		},
 		SilenceUsage: true,
 	}
 
-	cmd.PersistentFlags().BoolVar(&m.Debug, "debug", false, "Enable debug logging")
+	cmd.PersistentFlags().BoolVar(&m.DebugMode, "debug", false, "Enable debug logging")
 
 	cmd.AddCommand(buildVersionCommand(m))
 	cmd.AddCommand(buildSchemaCommand(m))
 	cmd.AddCommand(buildBuildCommand(m))
 	cmd.AddCommand(buildInstallCommand(m))
 	cmd.AddCommand(buildUninstallCommand(m))
 
-	return cmd, nil
+	return cmd
 }

cmd/arm/main.go

@@ -10,7 +10,7 @@ func buildUninstallCommand(m *arm.Mixin) *cobra.Command {
 		Use:   "uninstall",
 		Short: "Execute the uninstall functionality of this mixin",
 		RunE: func(cmd *cobra.Command, args []string) error {
-			return m.Uninstall()
+			return m.Uninstall(cmd.Context())
 		},
 	}
 	return cmd