Fn cli multi arch changes (#1596)

* adding support for architectures parameter

Author: ssunny3141

.circleci/config.yml

@@ -2,10 +2,12 @@ version: 2
 jobs:
   build:
     machine:
-      image: circleci/classic:201708-01
+      image: ubuntu-2004:202101-01
     working_directory: ~/go/src/github.com/fnproject/fn
     environment: # apparently expansion doesn't work here yet: https://discuss.circleci.com/t/environment-variable-expansion-in-working-directory/11322
+      - GO111MODULE=on
       - GOPATH=/home/circleci/go
+      - GOFLAGS=-mod=vendor
       - GOVERSION=1.12.1
       - OS=linux
       - ARCH=amd64
@@ -34,6 +36,7 @@ jobs:
       - run: git config diff.renamelimit 65535
       # NOTE: if GOFLAGS and GOMODULE are set, gosec will be noisy. unset them (run this before any 'make' command)
       - run: |
+          GOPATH=/home/circleci/go:$GOPATH
           wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s -- -b $GOPATH/bin 1.2.0
           $GOPATH/bin/gosec -quiet -severity medium ./...
 

api/agent/agent_repo_test.go

@@ -108,7 +108,8 @@ func getFakeDocker(t *testing.T) (*httptest.Server, func()) {
 				return
 			}
 			w.Header().Set("Content-Type", `application/vnd.docker.distribution.manifest.list.v2+json`)
-			w.Header().Set("Docker-Content-Digest", `sha256:0553537fa07e2d97debdc40cdf6c6c9d0db7e57591bd86cd7c721f0161542a9e`)
+			w.Header().Set("Docker-Content-Digest",
+				`sha256:0553537fa07e2d97debdc40cdf6c6c9d0db7e57591bd86cd7c721f0161542a9e`)
 			w.Header().Set("Docker-Distribution-Api-Version", `registry/2.0`)
 			logStatus(r, 200)
 			w.WriteHeader(200)
@@ -123,7 +124,8 @@ func getFakeDocker(t *testing.T) (*httptest.Server, func()) {
 				return
 			}
 			w.Header().Set("Content-Type", `application/vnd.docker.distribution.manifest.v2+json`)
-			w.Header().Set("Docker-Content-Digest", `sha256:1c80d00e6877ff57b9b941ab2cbc5bc1058c28294d7068074ccaecb29a1680d3`)
+			w.Header().Set("Docker-Content-Digest",
+				`sha256:1c80d00e6877ff57b9b941ab2cbc5bc1058c28294d7068074ccaecb29a1680d3`)
 			w.Header().Set("Docker-Distribution-Api-Version", `registry/2.0`)
 			logStatus(r, 200)
 			w.WriteHeader(200)
@@ -156,6 +158,22 @@ func getFakeDocker(t *testing.T) (*httptest.Server, func()) {
 			return
 		}
 
+		if r.URL.String() == `/v2/foo/bar/manifests/sha256:0553537fa07e2d97debdc40cdf6c6c9d0db7e57591bd86cd7c721f0161542a9e` {
+			if !manifestDone {
+				manifestDone = true
+				spitError(r, w, 429)
+				return
+			}
+			w.Header().Set("Content-Type", `application/vnd.docker.distribution.manifest.v2+json`)
+			w.Header().Set("Docker-Content-Digest",
+				`sha256:1c80d00e6877ff57b9b941ab2cbc5bc1058c28294d7068074ccaecb29a1680d3`)
+			w.Header().Set("Docker-Distribution-Api-Version", `registry/2.0`)
+			logStatus(r, 200)
+			w.WriteHeader(200)
+			w.Write([]byte(manifest))
+			return
+		}
+
 		logStatus(r, 500)
 		w.WriteHeader(500)
 		return

api/agent/drivers/docker/docker_client.go

@@ -1,3 +1,4 @@
+//go:build go1.7
 // +build go1.7
 
 package docker

api/agent/iofs_notlinux.go

@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package agent

api/common/unix_logging.go

@@ -1,3 +1,4 @@
+//go:build !windows && !nacl && !plan9
 // +build !windows,!nacl,!plan9
 
 package common

api/common/win_logging.go

@@ -1,3 +1,4 @@
+//go:build !linux && !darwin
 // +build !linux,!darwin
 
 package common

api/datastore/sql/migrations/25_add_shape_apps.go

@@ -0,0 +1,70 @@
+package migrations
+
+import (
+	"context"
+	"database/sql"
+	"github.com/fnproject/fn/api/models"
+
+	"github.com/fnproject/fn/api/datastore/sql/migratex"
+	"github.com/jmoiron/sqlx"
+)
+
+func up25(ctx context.Context, tx *sqlx.Tx) error {
+
+	// Firstly add a new column shape
+	_, err := tx.ExecContext(ctx, "ALTER TABLE apps ADD shape TEXT;")
+	if err != nil {
+		return err
+	}
+
+	rows, err := tx.QueryxContext(ctx, "SELECT id FROM apps;")
+	if err != nil {
+		return err
+	}
+
+	res := []*models.App{}
+	for rows.Next() {
+
+		var app models.App
+		err := rows.StructScan(&app)
+		if err != nil {
+			if err == sql.ErrNoRows {
+				return nil
+			}
+			return err
+		}
+		// Set shape default value as empty string in order to avoid sql scan errors
+		app.Shape = ""
+		res = append(res, &app)
+	}
+	err = rows.Close()
+	if err != nil {
+		return err
+	}
+
+	if err := rows.Err(); err != nil {
+		return err
+	}
+
+	for _, app := range res {
+		query := tx.Rebind(`UPDATE apps SET shape=:shape WHERE id=:id`)
+		_, err = tx.NamedExecContext(ctx, query, app)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func down25(ctx context.Context, tx *sqlx.Tx) error {
+	_, err := tx.ExecContext(ctx, "ALTER TABLE apps DROP COLUMN shape;")
+	return err
+}
+
+func init() {
+	Migrations = append(Migrations, &migratex.MigFields{
+		VersionFunc: vfunc(25),
+		UpFunc:      up25,
+		DownFunc:    down25,
+	})
+}

api/datastore/sql/migrations/26_add_shape_fns.go

@@ -0,0 +1,70 @@
+package migrations
+
+import (
+	"context"
+	"database/sql"
+	"github.com/fnproject/fn/api/models"
+
+	"github.com/fnproject/fn/api/datastore/sql/migratex"
+	"github.com/jmoiron/sqlx"
+)
+
+func up26(ctx context.Context, tx *sqlx.Tx) error {
+
+	// Firstly add a new column shape
+	_, err := tx.ExecContext(ctx, "ALTER TABLE fns ADD shape TEXT;")
+	if err != nil {
+		return err
+	}
+
+	rows, err := tx.QueryxContext(ctx, "SELECT id,app_id FROM fns;")
+	if err != nil {
+		return err
+	}
+
+	res := []*models.Fn{}
+	for rows.Next() {
+
+		var fn models.Fn
+		err := rows.StructScan(&fn)
+		if err != nil {
+			if err == sql.ErrNoRows {
+				return nil
+			}
+			return err
+		}
+		// Set shape default value as empty string in order to avoid sql scan errors
+		fn.Shape = ""
+		res = append(res, &fn)
+	}
+	err = rows.Close()
+	if err != nil {
+		return err
+	}
+
+	if err := rows.Err(); err != nil {
+		return err
+	}
+
+	for _, app := range res {
+		query := tx.Rebind(`UPDATE fns SET shape=:shape WHERE id=:id and app_id=:app_id`)
+		_, err = tx.NamedExecContext(ctx, query, app)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func down26(ctx context.Context, tx *sqlx.Tx) error {
+	_, err := tx.ExecContext(ctx, "ALTER TABLE fns DROP COLUMN shape;")
+	return err
+}
+
+func init() {
+	Migrations = append(Migrations, &migratex.MigFields{
+		VersionFunc: vfunc(26),
+		UpFunc:      up26,
+		DownFunc:    down26,
+	})
+}

api/datastore/sql/sql.go

@@ -31,7 +31,6 @@ import (
 // fields not contiguous with other fields and this field is a fixed size,
 // we'll get better locality with varchar. it's not terribly easy to do this
 // with migrations (sadly, need complex transaction)
-
 var tables = [...]string{
 	`CREATE TABLE IF NOT EXISTS apps (
 	id varchar(256) NOT NULL PRIMARY KEY,
@@ -40,7 +39,8 @@ var tables = [...]string{
 	annotations text NOT NULL,
 	syslog_url text,
 	created_at varchar(256),
-	updated_at varchar(256)
+	updated_at varchar(256),
+	shape text
 );`,
 
 	`CREATE TABLE IF NOT EXISTS triggers (
@@ -68,15 +68,16 @@ var tables = [...]string{
 	annotations text NOT NULL,
 	created_at varchar(256) NOT NULL,
 	updated_at varchar(256) NOT NULL,
+	shape text,
     CONSTRAINT name_app_id_unique UNIQUE (app_id, name)
 );`,
 }
 
 const (
-	appIDSelector     = `SELECT id, name, config, annotations, syslog_url, created_at, updated_at FROM apps WHERE id=?`
+	appIDSelector     = `SELECT id, name, config, annotations, syslog_url, created_at, updated_at, shape FROM apps WHERE id=?`
 	ensureAppSelector = `SELECT id FROM apps WHERE name=?`
 
-	fnSelector   = `SELECT id,name,app_id,image,memory,timeout,idle_timeout,config,annotations,created_at,updated_at FROM fns`
+	fnSelector   = `SELECT id,name,app_id,image,memory,timeout,idle_timeout,config,annotations,created_at,updated_at,shape FROM fns`
 	fnIDSelector = fnSelector + ` WHERE id=?`
 
 	triggerSelector   = `SELECT id,name,app_id,fn_id,type,source,annotations,created_at,updated_at FROM triggers`
@@ -321,7 +322,8 @@ func (ds *SQLStore) InsertApp(ctx context.Context, newApp *models.App) (*models.
 		annotations,
 		syslog_url,
 		created_at,
-		updated_at
+		updated_at, 
+		shape	
 	)
 	VALUES (
 		:id,
@@ -330,8 +332,10 @@ func (ds *SQLStore) InsertApp(ctx context.Context, newApp *models.App) (*models.
 		:annotations,
 		:syslog_url,
 		:created_at,
-		:updated_at
+		:updated_at,
+		:shape
 	);`)
+
 	_, err := ds.db.NamedExecContext(ctx, query, app)
 	if err != nil {
 		if ds.helper.IsDuplicateKeyError(err) {
@@ -369,8 +373,8 @@ func (ds *SQLStore) UpdateApp(ctx context.Context, newapp *models.App) (*models.
 		if err != nil {
 			return err
 		}
-
 		query = tx.Rebind(`UPDATE apps SET config=:config, annotations=:annotations, syslog_url=:syslog_url, updated_at=:updated_at WHERE name=:name`)
+
 		res, err := tx.NamedExecContext(ctx, query, app)
 		if err != nil {
 			return err
@@ -445,7 +449,8 @@ func (ds *SQLStore) GetApps(ctx context.Context, filter *models.AppFilter) (*mod
 		return nil, err
 	}
 	/* #nosec */
-	query = ds.db.Rebind(fmt.Sprintf("SELECT DISTINCT id, name, config, annotations, syslog_url, created_at, updated_at FROM apps %s", query))
+	query = ds.db.Rebind(fmt.Sprintf("SELECT DISTINCT id, name, config, annotations, syslog_url, created_at, updated_at, shape FROM apps %s", query))
+
 	rows, err := ds.db.QueryxContext(ctx, query, args...)
 	if err != nil {
 		return nil, err
@@ -496,6 +501,19 @@ func (ds *SQLStore) InsertFn(ctx context.Context, newFn *models.Fn) (*models.Fn,
 			}
 		}
 
+		var app models.App
+		query = tx.Rebind(appIDSelector)
+		row := tx.QueryRowxContext(ctx, query, fn.AppID)
+
+		if err := row.StructScan(&app); err != nil {
+			if err == sql.ErrNoRows {
+				return models.ErrAppsNotFound
+			}
+		}
+
+		//Setting the fn shape same as the application shape
+		fn.Shape = app.Shape
+
 		query = tx.Rebind(`INSERT INTO fns (
 				id,
 				name,
@@ -507,7 +525,8 @@ func (ds *SQLStore) InsertFn(ctx context.Context, newFn *models.Fn) (*models.Fn,
 				config,
 				annotations,
 				created_at,
-				updated_at
+				updated_at,
+				shape
 			)
 			VALUES (
 				:id,
@@ -520,7 +539,8 @@ func (ds *SQLStore) InsertFn(ctx context.Context, newFn *models.Fn) (*models.Fn,
 				:config,
 				:annotations,
 				:created_at,
-				:updated_at
+				:updated_at,
+				:shape
 			);`)
 
 		_, err = tx.NamedExecContext(ctx, query, fn)
@@ -565,7 +585,8 @@ func (ds *SQLStore) UpdateFn(ctx context.Context, fn *models.Fn) (*models.Fn, er
 				idle_timeout = :idle_timeout,
 				config = :config,
 				annotations = :annotations,
-				updated_at = :updated_at
+				updated_at = :updated_at,
+				shape = :shape
 			    WHERE id=:id;`)
 
 		_, err = tx.NamedExecContext(ctx, query, fn)