Fn cli multi arch (#656)

* support for architectures types in application create and deploy

* fixing --local flag for deploy

* testing with local fnserver image

* fixing bug introduced by reading response body before processing

* updating oci sdk for arch param inclusion

* adding arm64 lib build

* shape type support and shape in function inspect

* updating go version in dockerfile

* using default builder instance for supported platforms for single arch

* updating oci sdk

* optimizing deploy

* updating fn_go to public version

* adding release to linux arm64 code

---------

Co-authored-by: Vishal Maurya <[email protected]>

Author: ssunny3141

.circleci/config.yml

@@ -8,7 +8,7 @@ jobs:
       - GO111MODULE=on
       - GOFLAGS=-mod=vendor
       - GOPATH=/home/circleci/go
-      - GOVERSION=1.16.3
+      - GOVERSION=1.17
       - OS=linux
       - ARCH=amd64
     steps:
@@ -35,6 +35,12 @@ jobs:
           command: make test
           no_output_timeout: 20m
           environment:
+      - run:
+          name: test build linux arm64
+          command: go build -o fn_linux_arm64
+          environment:
+            GOOS: linux
+            GOARCH: arm64
       - run:
           name: test build macos
           command: go build -o fn_mac

Dockerfile

@@ -15,7 +15,7 @@
 #
 
 # build stage
-FROM golang:1.16.3-alpine3.12 AS build-env
+FROM golang:1.17.0-alpine3.14 AS build-env
 RUN apk add --no-cache gcc musl-dev
 ARG D=/go/src/github.com/fnproject/cli
 ARG GO111MODULE=on
@@ -24,7 +24,7 @@ ADD . $D
 RUN cd $D && go build -o fn-alpine && cp fn-alpine /tmp/
 
 # final stage
-FROM alpine:3.12
+FROM alpine:3.14
 RUN apk add --no-cache ca-certificates curl
 WORKDIR /app
 COPY --from=build-env /tmp/fn-alpine /app/fn

RELEASES.md

@@ -1,6 +1,16 @@
 
 # Releases
 
+## v 0.6.25
+
+* Support for multiple shapes(architectures) functions images: 
+  * x86 (default)
+  * arm
+  * multiarch (x86, arm)
+  
+* cli now is supported on `Arm Linux` as well.
+
+
 ## v 0.6.24
 
 * Allowing `fn inspect functions` and `fn list functions` for PBF(Pre-Built Functions) function with empty image and digest field. By default, it was not supported. 

THIRD_PARTY_LICENSES.txt

@@ -105,7 +105,7 @@ The following dependencies of fn-cli are licensed under Apache 2.0 license
 
 github.com/coreos/go-semver/semver
 github.com/golang/mock/gomock
-github.com/oracle/oci-go-sdk/v48
+github.com/oracle/oci-go-sdk/v65
 github.com/go-openapi/validate
 github.com/xeipuuv/gojsonpointer
 github.com/go-openapi/loads
@@ -1880,7 +1880,7 @@ Google Inc.
 -----------------------------------------------------------------
 The following dependency of fn-cli is licensed under Apache License 2.0
 
-github.com/oracle/oci-go-sdk/v48
+github.com/oracle/oci-go-sdk/v65
 
 Apache License 2.0 : A copy of the Apache License V2.0 is included in this file.
 

commands/build.go

@@ -18,11 +18,10 @@ package commands
 
 import (
 	"fmt"
-	"os"
-	"path/filepath"
-
 	"github.com/fnproject/cli/common"
 	"github.com/urfave/cli"
+	"os"
+	"path/filepath"
 )
 
 // BuildCommand returns build cli.command
@@ -97,7 +96,9 @@ func (b *buildcmd) build(c *cli.Context) error {
 		}
 
 		buildArgs := c.StringSlice("build-arg")
-		ff, err = common.BuildFuncV20180708(common.IsVerbose(), fpath, ff, buildArgs, b.noCache)
+
+		// Passing empty shape for build command
+		ff, err = common.BuildFuncV20180708(common.IsVerbose(), fpath, ff, buildArgs, b.noCache, "")
 		if err != nil {
 			return err
 		}

commands/build_server.go

@@ -117,7 +117,7 @@ func (b *BuildServerCmd) buildServer(c *cli.Context) error {
 	if err != nil {
 		return err
 	}
-	err = common.RunBuild(common.IsVerbose(), dir, c.String("tag"), "Dockerfile", nil, b.noCache, containerEngineType)
+	err = common.RunBuild(common.IsVerbose(), dir, c.String("tag"), "Dockerfile", nil, b.noCache, containerEngineType, "")
 	if err != nil {
 		return err
 	}

commands/deploy.go

@@ -39,9 +39,9 @@ import (
 	trigger "github.com/fnproject/cli/objects/trigger"
 	v2Client "github.com/fnproject/fn_go/clientv2"
 	models "github.com/fnproject/fn_go/modelsv2"
-	"github.com/oracle/oci-go-sdk/v48/artifacts"
-	ociCommon "github.com/oracle/oci-go-sdk/v48/common"
-	"github.com/oracle/oci-go-sdk/v48/keymanagement"
+	"github.com/oracle/oci-go-sdk/v65/artifacts"
+	ociCommon "github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/keymanagement"
 	"github.com/urfave/cli"
 )
 
@@ -58,7 +58,6 @@ type Message struct {
 }
 
 var RegionsWithOldKMSEndpoints = map[ociCommon.Region]struct{}{
-	ociCommon.RegionSEA:           {},
 	ociCommon.RegionPHX:           {},
 	ociCommon.RegionIAD:           {},
 	ociCommon.RegionFRA:           {},
@@ -184,6 +183,7 @@ func (p *deploycmd) flags() []cli.Flag {
 // on the file system (can be overridden using the `path` arg in each `func.yaml`. The index/root function
 // is the one that lives in the same directory as the app.yaml.
 func (p *deploycmd) deploy(c *cli.Context) error {
+
 	appName := ""
 	dir := common.GetDir(c)
 
@@ -384,21 +384,30 @@ func (p *deploycmd) deployFuncV20180708(c *cli.Context, app *models.App, funcfil
 	}
 
 	buildArgs := c.StringSlice("build-arg")
-	_, err := common.BuildFuncV20180708(common.IsVerbose(), funcfilePath, funcfile, buildArgs, p.noCache)
-	if err != nil {
-		return err
-	}
 
+	// In case of local ignore the architectures parameter
+	shape := ""
 	if !p.local {
-		if err := common.PushV20180708(funcfile); err != nil {
-			return err
+		// fetch the architectures
+		shape = app.Shape
+		if shape == "" {
+			shape = common.DefaultAppShape
+			app.Shape = shape
+		}
+
+		if _, ok := common.ShapeMap[shape]; !ok {
+			return errors.New(fmt.Sprintf("Invalid application : %s shape: %s", app.Name, shape))
 		}
 	}
 
-	if err := p.signImage(funcfile); err != nil {
+	_, err := common.BuildFuncV20180708(common.IsVerbose(), funcfilePath, funcfile, buildArgs, p.noCache, shape)
+	if err != nil {
 		return err
 	}
 
+	if err := p.signImage(funcfile); err != nil {
+		return err
+	}
 	return p.updateFunction(c, app.ID, funcfile)
 }
 

commands/image_signature_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/fnproject/cli/common"
 	"github.com/fnproject/cli/config"
 	"github.com/fnproject/fn_go/provider/oracle"
-	ociCommon "github.com/oracle/oci-go-sdk/v48/common"
+	ociCommon "github.com/oracle/oci-go-sdk/v65/common"
 	"github.com/spf13/viper"
 	"net/url"
 	"testing"

commands/invoke_others.go

@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 package commands

commands/invoke_windows.go

@@ -1,3 +1,5 @@
+//go:build windows
+
 /*
  * Copyright (c) 2019, 2020 Oracle and/or its affiliates. All rights reserved.
  *
@@ -13,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-// +build windows
 
 package commands
 

commands/start.go

@@ -97,7 +97,6 @@ func start(c *cli.Context) error {
 	}
 
 	image := fmt.Sprintf("%s:%s", common.FunctionsDockerImage, c.String("version"))
-
 	args = append(args, image)
 	cmd := exec.Command("docker", args...)
 	cmd.Stdout = os.Stdout

common/color/windows.go

@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 package color