Просмотр исходного кода

Merge pull request #179 from porter-dev/beta.3.provisioning-integration

Beta.3.provisioning integration
abelanger5 5 лет назад
Родитель
Сommit
433585224b
4 измененных файлов с 1 добавлено и 92 удалено
  1. 0 42
      .darwin.goreleaser.yml
  2. 0 38
      .goreleaser.yml
  3. 1 1
      internal/models/infra.go
  4. 0 11
      package-lock.json

+ 0 - 42
.darwin.goreleaser.yml

@@ -1,42 +0,0 @@
-before:
-  hooks:
-    - go mod download
-builds:
-  - id: "porter-cli"
-    binary: porter
-    ldflags:
-    - -X 'github.com/porter-dev/porter/cli/cmd.Version={{.Version}}'
-    env:
-      - CGO_ENABLED=1
-    dir: cli
-    main: ./main.go
-    goos:
-      - darwin
-    goarch:
-      - amd64
-    flags:
-      - -tags=cli
-    hooks:
-      post: gon gon.cli.hcl
-  # - id: "porter-server"
-  #   binary: portersvr
-  #   env:
-  #     - CGO_ENABLED=1
-  #   dir: cmd/app
-  #   main: ./main.go
-  #   goos:
-  #     - darwin
-  #   goarch:
-  #     - amd64
-  #   hooks:
-  #     post: gon gon.server.hcl
-archives:
-  - format: binary
-    replacements:
-      darwin: Darwin
-release:
-  disable: true
-checksum:
-  disable: true
-changelog:
-  skip: true

+ 0 - 38
.goreleaser.yml

@@ -1,38 +0,0 @@
-before:
-  hooks:
-    - go mod download
-builds:
-  - id: "porter-cli"
-    ldflags:
-    - -X 'github.com/porter-dev/porter/cli/cmd.Version={{.Version}}'
-    binary: porter
-    dir: cli
-    main: ./main.go
-    goos:
-      - linux
-      - windows
-    goarch:
-      - amd64
-    flags:
-      - -tags=cli
-  # - id: "porter-server"
-  #   binary: portersvr
-  #   dir: cmd/app
-  #   main: ./main.go
-  #   goos:
-  #     - linux
-  #     - windows
-  #   goarch:
-  #     - amd64
-archives:
-  - format: zip
-    replacements:
-      linux: Linux
-      windows: Windows
-      amd64: x86_64
-release:
-  disable: true
-# checksum:
-#   disable: true
-changelog:
-  skip: true

+ 1 - 1
internal/models/infra.go

@@ -83,7 +83,7 @@ func (ai *AWSInfra) GetID() string {
 func ParseWorkspaceID(workspaceID string) (string, uint, uint, error) {
 	strArr := strings.Split(workspaceID, "-")
 
-	if len(strArr) != 3 {
+	if len(strArr) < 3 {
 		return "", 0, 0, fmt.Errorf("workspace id improperly formatted")
 	}
 

+ 0 - 11
package-lock.json

@@ -1,11 +0,0 @@
-{
-  "requires": true,
-  "lockfileVersion": 1,
-  "dependencies": {
-    "@types/random-words": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@types/random-words/-/random-words-1.1.0.tgz",
-      "integrity": "sha512-YZqkHIAGoXv6mlyEOwluhMjF9aotH2m9HrCCR+PNtES/ED00u5u4W7X1lWxc5AaFRKdKx+5orWTFW7iyGrZpOQ=="
-    }
-  }
-}