Deploy to Production - 2022/2/16

.github/workflows/deploy_prod.yml

@@ -34,9 +34,13 @@ jobs:
         run: git fetch --tags
 
       - name: Build
+        env: 
+          STORAGE_API: ${{ secrets.STORAGE_API_STAGE }}
         run: make build ENVFILE=./env/prod
 
       - name: Cross-build
+        env: 
+          STORAGE_API: ${{ secrets.STORAGE_API_STAGE }}
         run: make cross-build ENVFILE=./env/prod
 
       - name: Install AWS CLI
@@ -76,5 +80,6 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
           API_URL: https://api.azionapi.net
+          STORAGE_URL: ${{ secrets.STORAGE_API_STAGE }}
           AUTH_URL: https://sso.azion.com/api/user/me
           TEMPLATE_BRANCH: main

.github/workflows/deploy_stage.yml

@@ -38,12 +38,14 @@ jobs:
         env: 
           AZION_API: ${{ secrets.AZION_API_STAGE }}
           AZION_SSO: ${{ secrets.AZION_SSO_STAGE }}
+          STORAGE_API: ${{ secrets.STORAGE_API_STAGE }}
         run: make build ENVFILE=./env/stage
 
       - name: Cross-build
         env: 
           AZION_API: ${{ secrets.AZION_API_STAGE }}
           AZION_SSO: ${{ secrets.AZION_SSO_STAGE }}
+          STORAGE_API: ${{ secrets.STORAGE_API_STAGE }}
         run: make cross-build ENVFILE=./env/stage
 
       - name: Install AWS CLI

.goreleaser.yaml

@@ -8,6 +8,7 @@ builds:
       - -X github.com/aziontech/azion-cli/pkg/cmd/version.BinVersion={{ .Env.BIN_VERSION }}
       - -X github.com/aziontech/azion-cli/pkg/constants.AuthURL={{ .Env.AUTH_URL }}
       - -X github.com/aziontech/azion-cli/pkg/constants.ApiURL={{ .Env.API_URL }}
+      - -X github.com/aziontech/azion-cli/pkg/constants.StorageApiURL={{ .Env.STORAGE_URL }}
       - -X github.com/aziontech/azion-cli/pkg/pkg/cmd/edge_applications/init.TemplateBranch={{ .Env.TEMPLATE_BRANCH }}
     binary: azioncli
     goos:

Makefile

@@ -22,6 +22,7 @@ BIN := azioncli
 BIN_VERSION=$(shell git describe --tags)
 # The variables with $$ should be sourced from an envfile
 LDFLAGS=-X github.com/aziontech/azion-cli/pkg/cmd/version.BinVersion=$(BIN_VERSION) \
+		-X github.com/aziontech/azion-cli/pkg/constants.StorageApiURL=$$STORAGE_URL \
 		-X github.com/aziontech/azion-cli/pkg/constants.AuthURL=$$AUTH_URL \
 		-X github.com/aziontech/azion-cli/pkg/constants.ApiURL=$$API_URL \
 		-X github.com/aziontech/azion-cli/pkg/cmd/edge_applications/init.TemplateBranch=$$TEMPLATE_BRANCH \

env/prod

@@ -1,4 +1,5 @@
 API_URL=https://api.azionapi.net
 AUTH_URL=https://sso.azion.com/api/user/me
+STORAGE_URL=${STORAGE_API}
 TEMPLATE_BRANCH=main
 TEMPLATE_MAJOR=0

env/stage

@@ -1,4 +1,5 @@
 API_URL=https://${AZION_API}
 AUTH_URL=https://${AZION_SSO}/api/user/me
+STORAGE_URL=https://${STORAGE_API}
 TEMPLATE_BRANCH=dev
-TEMPLATE_MAJOR=0
+TEMPLATE_MAJOR=0

go.mod

@@ -3,8 +3,8 @@ module github.com/aziontech/azion-cli
 go 1.17
 
 require (
-	github.com/MaxwelMazur/tablecli v0.0.0-20230111205821-634576290228
-	github.com/aziontech/azionapi-go-sdk v0.20.0
+	github.com/MaxwelMazur/tablecli v0.0.0-20230208145104-c9458b902b58
+	github.com/aziontech/azionapi-go-sdk v0.23.0
 	github.com/fatih/color v1.13.0
 	github.com/go-git/go-git/v5 v5.4.2
 	github.com/spf13/cobra v1.6.1
@@ -52,6 +52,7 @@ require (
 	github.com/spf13/afero v1.9.2 // indirect
 	github.com/spf13/cast v1.5.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/subosito/gotenv v1.4.1 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect

go.sum

@@ -186,8 +186,8 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
-github.com/MaxwelMazur/tablecli v0.0.0-20230111205821-634576290228 h1:0v/h/69n72chjEeAWInSZ+0+WVGff/e/HK71DxcZPOo=
-github.com/MaxwelMazur/tablecli v0.0.0-20230111205821-634576290228/go.mod h1:XTbnIbjcCDbZenA2rqSIQK9aa4MSL//Wt/b04tgdCO4=
+github.com/MaxwelMazur/tablecli v0.0.0-20230208145104-c9458b902b58 h1:bqFhGlAuzkZzX+2P6fwKhg4PECvXF7Lr8V6g2iDrG0s=
+github.com/MaxwelMazur/tablecli v0.0.0-20230208145104-c9458b902b58/go.mod h1:eepQZpVhQN9tZIbJ+/nLb+Gi/vUAjzQsB0eLhfnB5gk=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
@@ -212,8 +212,8 @@ github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
-github.com/aziontech/azionapi-go-sdk v0.20.0 h1:a4hYtDlYMehwDBNGKaSgTFnKG9NNyjyE37HIsjlmGc8=
-github.com/aziontech/azionapi-go-sdk v0.20.0/go.mod h1:2caFKH52viwZI346MWCGDZzU0jGll6udJZZMDJNrWgg=
+github.com/aziontech/azionapi-go-sdk v0.23.0 h1:hVRgXSAwmX5MSx2Mhjpd1ifuL34zZAZLvFBSmEDLKz0=
+github.com/aziontech/azionapi-go-sdk v0.23.0/go.mod h1:wL7eJYyE2qU853U2iKnQuFHoY69N5WwGnQJwySsdtX0=
 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -471,6 +471,7 @@ github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOA
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
@@ -524,6 +525,7 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
 github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
 github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
@@ -556,6 +558,7 @@ github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+eg
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=

messages/edge_applications/errors.go

@@ -63,4 +63,6 @@ var (
 	ErrorMissingApplicationIdJson    = errors.New("Application ID is missing from azion.json. Please initialize and publish your project first before using cascade delete")
 	ErrorMissingAzionJson            = errors.New("Azion.json file is missing. Please initialize and publish your project first before using cascade delete")
 	ErrorFailedUpdateAzionJson       = errors.New("Failed to update azion.json file to remove IDs of deleted resource")
+
+	ErrorGetVersionId = errors.New("Failed to get Version Id: %s")
 )

messages/edge_applications/messages.go

@@ -8,18 +8,18 @@ var (
 
 	//edge_applications cmd
 	EdgeApplicationsUsage            = "edge_applications"
-	EdgeApplicationsShortDescription = "Creates Web Applications on Azion's platform"
-	EdgeApplicationsLongDescription  = "Build your Web applications in minutes without the need to manage infrastructure or security"
+	EdgeApplicationsShortDescription = "Creates Edge Applications on Azion's platform"
+	EdgeApplicationsLongDescription  = "Build your Edge applications in minutes without the need to manage infrastructure or security"
 	EdgeApplicationsFlagHelp         = "Displays more information about the edge_application command"
 	EdgeApplicationsAutoDetectec     = "Auto-detected Project Settings (%s)\n"
 
 	//build cmd
 	EdgeApplicationsBuildUsage            = "build [flags]"
-	EdgeApplicationsBuildShortDescription = "Builds a Web Application"
-	EdgeApplicationsBuildLongDescription  = "Builds your Web Application to run on Azion’s Edge Computing Platform"
+	EdgeApplicationsBuildShortDescription = "Builds an Edge Application"
+	EdgeApplicationsBuildLongDescription  = "Builds your Edge Application to run on Azion’s Edge Computing Platform"
 	EdgeApplicationsBuildRunningCmd       = "Running build step command:\n\n"
-	EdgeApplicationsBuildStart            = "Building your Web Application\n"
-	EdgeApplicationsBuildSuccessful       = "Your Web Application was built successfully\n"
+	EdgeApplicationsBuildStart            = "Building your Edge Application\n"
+	EdgeApplicationsBuildSuccessful       = "Your Edge Application was built successfully\n"
 	EdgeApplicationsBuildFlagHelp         = "Displays more information about the build subcommand"
 	EdgeApplicationsBuildCdn              = "Skipping build step. Build isn't applied to the type 'CDN'"
 
@@ -30,11 +30,11 @@ var (
 	javascript          Create a serverless Javascript application on edge.
 	flareact            Create a serverless Flareact application on edge.
 	nextjs              Create a serverless NextJS edge-runtime application on edge.`
-	EdgeApplicationsInitShortDescription  = "Initializes a Web Application"
-	EdgeApplicationsInitLongDescription   = "Defines primary parameters based on a given name and application type to start a Web Application on Azion’s platform"
+	EdgeApplicationsInitShortDescription  = "Initializes an Edge Application"
+	EdgeApplicationsInitLongDescription   = "Defines primary parameters based on a given name and application type to start a Edge Application on Azion’s platform"
 	EdgeApplicationsInitRunningCmd        = "Running init step command:\n\n"
-	EdgeApplicationsInitFlagName          = "The Web application's name"
-	EdgeApplicationsInitFlagType          = "The type of  Web application <javascript | flareact | nextjs>"
+	EdgeApplicationsInitFlagName          = "The Edge application's name"
+	EdgeApplicationsInitFlagType          = "The type of Edge application <javascript | flareact | nextjs>"
 	EdgeApplicationsInitFlagYes           = "Forces the automatic response 'yes' to all user input"
 	EdgeApplicationsInitFlagNo            = "Forces the automatic response 'no' to all user input"
 	WebAppInitContentOverridden           = "This project was already configured. Do you want to override the previous configuration? <yes | no> (default: no) "
@@ -47,10 +47,10 @@ var (
 
 	//publish cmd
 	EdgeApplicationsPublishUsage                       = "publish"
-	EdgeApplicationsPublishShortDescription            = "Publishes a Web Application on the Azion platform"
-	EdgeApplicationsPublishLongDescription             = "Publishes a Web Application based on the Azion’s Platform"
+	EdgeApplicationsPublishShortDescription            = "Publishes an Edge Application on the Azion platform"
+	EdgeApplicationsPublishLongDescription             = "Publishes an Edge Application based on the Azion’s Platform"
 	EdgeApplicationsPublishRunningCmd                  = "Running pre publish command:\n\n"
-	EdgeApplicationsPublishSuccessful                  = "Your Web Application was published successfully\n"
+	EdgeApplicationsPublishSuccessful                  = "Your Edge Application was published successfully\n"
 	EdgeApplicationsCdnPublishSuccessful               = "Your CDN Edge Application was published successfully\n"
 	EdgeApplicationsPublishOutputDomainSuccess         = "\nTo visualize your application access the domain: %s\n"
 	EdgeApplicationsPublishOutputCachePurge            = "Domain cache was purged\n"

messages/origins/errors.go

@@ -0,0 +1,17 @@
+package origins
+
+import "errors"
+
+var (
+	ErrorGetOrigins                   = errors.New("Failed to describe the origins: %s. Check your settings and try again. If the error persists, contact Azion support.")
+	ErrorGetOrigin                    = errors.New("Failed to describe the origin. Check your settings and try again. If the error persists, contact Azion support.")
+	ErrorMissingApplicationIDArgument = errors.New("A required flag is missing. You must supply application-id as an argument. Run 'azioncli <command> <subcommand> --help' command to display more information and try again")
+	ErrorMissingArguments             = errors.New("Required flags are missing. You must supply application-id and origin-id as arguments. Run 'azioncli <command> <subcommand> --help' command to display more information and try again")
+	ErrorMissingArgumentsDelete       = errors.New("Required flags are missing. You must supply application-id and origin-key as arguments. Run 'azioncli <command> <subcommand> --help' command to display more information and try again")
+	ErrorMandatoryCreateFlags         = errors.New("Required flags are missing. You must provide application-id, name, addresses and host-header flags when the --application-id and --in flag are not provided. Run the command 'azioncli <command> <subcommand> --help' to display more information and try again.")
+	ErrorMandatoryUpdateFlags         = errors.New("Required flags are missing. You must provide application-id and origin-id flags when the --application-id and --in flag are not provided. Run the command 'azioncli <command> <subcommand> --help' to display more information and try again.")
+	ErrorHmacAuthenticationFlag       = errors.New("Invalid --hmac-authentication flag provided. The flag must have  'true' or 'false' values. Run the command 'azioncli <command> <subcommand> --help' to display more information and try again.")
+	ErrorCreateOrigin                 = errors.New("Failed to create the Origin: %s. Check your settings and try again. If the error persists, contact Azion support.")
+	ErrorUpdateOrigin                 = errors.New("Failed to update the Origin: %s. Check your settings and try again. If the error persists, contact Azion support.")
+	ErrorFailToDelete                 = errors.New("Failed to delete the Origin: %s. Check your settings and try again. If the error persists, contact Azion support.")
+)