-
Notifications
You must be signed in to change notification settings - Fork 398
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
apps: fix yaml spec handling and add support for log following (#842)
* vendor: sigs.k8s.io/yaml * apps: fix handling of yaml spec files * apps: add support for following logs * vendor: bump github.com/digitalocean/[email protected] * apps: include generic git source in test case * apps: update app mocks
- Loading branch information
Showing
19 changed files
with
223 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ import ( | |
| "github.com/digitalocean/doctl" | ||
| "github.com/digitalocean/godo" | ||
| "github.com/google/uuid" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| ) | ||
|
|
||
|
|
@@ -284,13 +285,95 @@ func TestRunAppsGetLogs(t *testing.T) { | |
|
|
||
| for typeStr, logType := range types { | ||
| withTestClient(t, func(config *CmdConfig, tm *tcMocks) { | ||
| tm.apps.EXPECT().GetLogs(appID, deploymentID, component, logType).Times(1).Return(&godo.AppLogs{LiveURL: "https://proxy-apps-prod-ams3-001.ondigitalocean.app/?token=..."}, nil) | ||
| tm.apps.EXPECT().GetLogs(appID, deploymentID, component, logType, true).Times(1).Return(&godo.AppLogs{LiveURL: "https://proxy-apps-prod-ams3-001.ondigitalocean.app/?token=..."}, nil) | ||
|
|
||
| config.Args = append(config.Args, appID, deploymentID, component) | ||
| config.Doit.Set(config.NS, doctl.ArgAppLogType, typeStr) | ||
| config.Doit.Set(config.NS, doctl.ArgAppLogFollow, true) | ||
|
|
||
| err := RunAppsGetLogs(config) | ||
| require.NoError(t, err) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func Test_parseAppSpec(t *testing.T) { | ||
| expectedSpec := &godo.AppSpec{ | ||
| Name: "test", | ||
| Services: []godo.AppServiceSpec{ | ||
| { | ||
| Name: "web", | ||
| GitHub: godo.GitHubSourceSpec{ | ||
| Repo: "digitalocean/sample-golang", | ||
| Branch: "master", | ||
| }, | ||
| }, | ||
| }, | ||
| StaticSites: []godo.AppStaticSiteSpec{ | ||
| { | ||
| Name: "static", | ||
| Git: godo.GitSourceSpec{ | ||
| RepoCloneURL: "[email protected]:digitalocean/sample-gatsby.git", | ||
| Branch: "master", | ||
| }, | ||
| Routes: []godo.AppRouteSpec{ | ||
| {Path: "/static"}, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
|
|
||
| t.Run("json", func(t *testing.T) { | ||
| spec, err := parseAppSpec([]byte(`{ | ||
| "name": "test", | ||
| "services": [ | ||
| { | ||
| "name": "web", | ||
| "github": { | ||
| "repo": "digitalocean/sample-golang", | ||
| "branch": "master" | ||
| } | ||
| } | ||
| ], | ||
| "static_sites": [ | ||
| { | ||
| "name": "static", | ||
| "git": { | ||
| "repo_clone_url": "[email protected]:digitalocean/sample-gatsby.git", | ||
| "branch": "master" | ||
| }, | ||
| "routes": [ | ||
| { | ||
| "path": "/static" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }`)) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, expectedSpec, spec) | ||
| }) | ||
| t.Run("yaml", func(t *testing.T) { | ||
| spec, err := parseAppSpec([]byte(` | ||
| name: test | ||
| services: | ||
| - name: web | ||
| github: | ||
| repo: digitalocean/sample-golang | ||
| branch: master | ||
| static_sites: | ||
| - name: static | ||
| git: | ||
| repo_clone_url: [email protected]:digitalocean/sample-gatsby.git | ||
| branch: master | ||
| routes: | ||
| - path: /static | ||
| `)) | ||
| require.NoError(t, err) | ||
| assert.Equal(t, expectedSpec, spec) | ||
| }) | ||
| t.Run("invalid", func(t *testing.T) { | ||
| _, err := parseAppSpec([]byte("invalid spec")) | ||
| require.Error(t, err) | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.