Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Orca 845 #89

Merged
merged 34 commits into from
Aug 2, 2021
Merged

Orca 845 #89

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
db8317f
Current progress
isatasan Jul 1, 2021
4afd452
Websocket implementation
isatasan Jul 7, 2021
14603fb
Fixing routes
isatasan Jul 7, 2021
d2db005
Adding url
isatasan Jul 7, 2021
ea40187
Fixed websocket connection
isatasan Jul 8, 2021
c914f02
Progress 7/9
isatasan Jul 9, 2021
1b87580
Added some channel logic
isatasan Jul 13, 2021
37f1aec
Changes to models.go
isatasan Jul 13, 2021
d8a4043
Working on log streaming for plan
isatasan Jul 14, 2021
41794f9
Beginning tests/Having errors
isatasan Jul 15, 2021
75682d1
Log Streaming Logic
isatasan Jul 15, 2021
3adca15
fixed test
isatasan Jul 16, 2021
6b47f89
Added Testing
isatasan Jul 19, 2021
a0ca5cd
Fixed websocket connection
isatasan Jul 19, 2021
706177c
Async implementation and test error fixes
isatasan Jul 26, 2021
29ab19d
Changes to variables in tests
isatasan Jul 26, 2021
7a7520d
Debugging
isatasan Jul 26, 2021
9825a13
Fixed UI in webpage terminal
isatasan Jul 28, 2021
63d8c0c
Fixing Run make-test coverage
isatasan Jul 28, 2021
6484035
Merge branch 'release-v0.17.1-lyft.1' into orca-845
msarvar Jul 28, 2021
8ddbd88
Fixing tests
isatasan Jul 28, 2021
b0fc54d
Testing
isatasan Jul 29, 2021
2df2e48
Deleted txt.act files
isatasan Jul 29, 2021
c6bf4f9
Fixing broken tests
msarvar Jul 29, 2021
4e5dc97
Changes to terraform_client testing
isatasan Jul 30, 2021
cbe65bd
Fixed tests in terraform_client_internal_test.go
isatasan Jul 30, 2021
3c8e8c9
Fixed failing test
isatasan Jul 30, 2021
ec8b863
Deleted lines causing test to fail
isatasan Jul 30, 2021
0d21c25
Reformating
isatasan Aug 2, 2021
176a6cd
More Reformatting
isatasan Aug 2, 2021
6a9a97c
Run make check-lint corrections
isatasan Aug 2, 2021
1b72113
Added error check
isatasan Aug 2, 2021
4b95f6d
Fixing check-lint test
isatasan Aug 2, 2021
0a8d352
Suggested changes prior to merge
isatasan Aug 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/events/terraform/terraform_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ func (c *DefaultClient) RunCommandAsync(ctx models.ProjectCommandContext, path s
ctx.Log.Info("successfully ran %q in %q", tfCmd, path)
}
}()

return inCh, outCh
}

Expand Down
249 changes: 100 additions & 149 deletions server/events/terraform/terraform_client_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

version "github.com/hashicorp/go-version"
"github.com/runatlantis/atlantis/server/events/models"
"github.com/runatlantis/atlantis/server/events/yaml/valid"
"github.com/runatlantis/atlantis/server/logging"
. "github.com/runatlantis/atlantis/testing"
)
Expand Down Expand Up @@ -91,29 +90,22 @@ func TestDefaultClient_RunCommandWithVersion_EnvVars(t *testing.T) {
v, err := version.NewVersion("0.11.11")
Ok(t, err)
tmp, cleanup := TempDir(t)
logger := logging.NewNoopLogger(t)
ctx := models.ProjectCommandContext{
Log: logging.NewNoopLogger(t),
Steps: []valid.Step{
{
StepName: "env",
EnvVarName: "name",
EnvVarValue: "value",
},
{
StepName: "run",
},
{
StepName: "apply",
},
{
StepName: "plan",
},
{
StepName: "init",
},
Log: logger,
Workspace: "default",
RepoRelDir: ".",
User: models.User{Username: "username"},
EscapedCommentArgs: []string{"comment", "args"},
ProjectName: "projectname",
Pull: models.PullRequest{
Num: 2,
},
BaseRepo: models.Repo{
FullName: "owner/repo",
Owner: "owner",
Name: "repo",
},
Workspace: "default",
RepoRelDir: ".",
}
defer cleanup()
client := &DefaultClient{
Expand All @@ -130,7 +122,8 @@ func TestDefaultClient_RunCommandWithVersion_EnvVars(t *testing.T) {
"ATLANTIS_TERRAFORM_VERSION=$ATLANTIS_TERRAFORM_VERSION",
"DIR=$DIR",
}
out, err := client.RunCommandWithVersion(ctx, tmp, args, map[string]string{}, nil, "workspace")
customEnvVars := map[string]string{}
out, err := client.RunCommandWithVersion(ctx, tmp, args, customEnvVars, v, "workspace")
Ok(t, err)
exp := fmt.Sprintf("TF_IN_AUTOMATION=true TF_PLUGIN_CACHE_DIR=%s WORKSPACE=workspace ATLANTIS_TERRAFORM_VERSION=0.11.11 DIR=%s\n", tmp, tmp)
Equals(t, exp, out)
Expand All @@ -141,29 +134,22 @@ func TestDefaultClient_RunCommandWithVersion_Error(t *testing.T) {
v, err := version.NewVersion("0.11.11")
Ok(t, err)
tmp, cleanup := TempDir(t)
logger := logging.NewNoopLogger(t)
ctx := models.ProjectCommandContext{
Log: logging.NewNoopLogger(t),
Steps: []valid.Step{
{
StepName: "env",
EnvVarName: "name",
EnvVarValue: "value",
},
{
StepName: "run",
},
{
StepName: "apply",
},
{
StepName: "plan",
},
{
StepName: "init",
},
Log: logger,
Workspace: "default",
RepoRelDir: ".",
User: models.User{Username: "username"},
EscapedCommentArgs: []string{"comment", "args"},
ProjectName: "projectname",
Pull: models.PullRequest{
Num: 2,
},
BaseRepo: models.Repo{
FullName: "owner/repo",
Owner: "owner",
Name: "repo",
},
Workspace: "default",
RepoRelDir: ".",
}
defer cleanup()
client := &DefaultClient{
Expand All @@ -188,29 +174,22 @@ func TestDefaultClient_RunCommandAsync_Success(t *testing.T) {
v, err := version.NewVersion("0.11.11")
Ok(t, err)
tmp, cleanup := TempDir(t)
logger := logging.NewNoopLogger(t)
ctx := models.ProjectCommandContext{
Log: logging.NewNoopLogger(t),
Steps: []valid.Step{
{
StepName: "env",
EnvVarName: "name",
EnvVarValue: "value",
},
{
StepName: "run",
},
{
StepName: "apply",
},
{
StepName: "plan",
},
{
StepName: "init",
},
Log: logger,
Workspace: "default",
RepoRelDir: ".",
User: models.User{Username: "username"},
EscapedCommentArgs: []string{"comment", "args"},
ProjectName: "projectname",
Pull: models.PullRequest{
Num: 2,
},
BaseRepo: models.Repo{
FullName: "owner/repo",
Owner: "owner",
Name: "repo",
},
Workspace: "default",
RepoRelDir: ".",
}
defer cleanup()
client := &DefaultClient{
Expand Down Expand Up @@ -239,29 +218,22 @@ func TestDefaultClient_RunCommandAsync_BigOutput(t *testing.T) {
v, err := version.NewVersion("0.11.11")
Ok(t, err)
tmp, cleanup := TempDir(t)
logger := logging.NewNoopLogger(t)
ctx := models.ProjectCommandContext{
Log: logging.NewNoopLogger(t),
Steps: []valid.Step{
{
StepName: "env",
EnvVarName: "name",
EnvVarValue: "value",
},
{
StepName: "run",
},
{
StepName: "apply",
},
{
StepName: "plan",
},
{
StepName: "init",
},
Log: logger,
Workspace: "default",
RepoRelDir: ".",
User: models.User{Username: "username"},
EscapedCommentArgs: []string{"comment", "args"},
ProjectName: "projectname",
Pull: models.PullRequest{
Num: 2,
},
BaseRepo: models.Repo{
FullName: "owner/repo",
Owner: "owner",
Name: "repo",
},
Workspace: "default",
RepoRelDir: ".",
}
defer cleanup()
client := &DefaultClient{
Expand Down Expand Up @@ -291,29 +263,22 @@ func TestDefaultClient_RunCommandAsync_StderrOutput(t *testing.T) {
v, err := version.NewVersion("0.11.11")
Ok(t, err)
tmp, cleanup := TempDir(t)
logger := logging.NewNoopLogger(t)
ctx := models.ProjectCommandContext{
Log: logging.NewNoopLogger(t),
Steps: []valid.Step{
{
StepName: "env",
EnvVarName: "name",
EnvVarValue: "value",
},
{
StepName: "run",
},
{
StepName: "apply",
},
{
StepName: "plan",
},
{
StepName: "init",
},
Log: logger,
Workspace: "default",
RepoRelDir: ".",
User: models.User{Username: "username"},
EscapedCommentArgs: []string{"comment", "args"},
ProjectName: "projectname",
Pull: models.PullRequest{
Num: 2,
},
BaseRepo: models.Repo{
FullName: "owner/repo",
Owner: "owner",
Name: "repo",
},
Workspace: "default",
RepoRelDir: ".",
}
defer cleanup()
client := &DefaultClient{
Expand All @@ -332,29 +297,22 @@ func TestDefaultClient_RunCommandAsync_ExitOne(t *testing.T) {
v, err := version.NewVersion("0.11.11")
Ok(t, err)
tmp, cleanup := TempDir(t)
logger := logging.NewNoopLogger(t)
ctx := models.ProjectCommandContext{
Log: logging.NewNoopLogger(t),
Steps: []valid.Step{
{
StepName: "env",
EnvVarName: "name",
EnvVarValue: "value",
},
{
StepName: "run",
},
{
StepName: "apply",
},
{
StepName: "plan",
},
{
StepName: "init",
},
Log: logger,
Workspace: "default",
RepoRelDir: ".",
User: models.User{Username: "username"},
EscapedCommentArgs: []string{"comment", "args"},
ProjectName: "projectname",
Pull: models.PullRequest{
Num: 2,
},
BaseRepo: models.Repo{
FullName: "owner/repo",
Owner: "owner",
Name: "repo",
},
Workspace: "default",
RepoRelDir: ".",
}
defer cleanup()
client := &DefaultClient{
Expand All @@ -374,29 +332,22 @@ func TestDefaultClient_RunCommandAsync_Input(t *testing.T) {
v, err := version.NewVersion("0.11.11")
Ok(t, err)
tmp, cleanup := TempDir(t)
logger := logging.NewNoopLogger(t)
ctx := models.ProjectCommandContext{
Log: logging.NewNoopLogger(t),
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you don't need to change these

Steps: []valid.Step{
{
StepName: "env",
EnvVarName: "name",
EnvVarValue: "value",
},
{
StepName: "run",
},
{
StepName: "apply",
},
{
StepName: "plan",
},
{
StepName: "init",
},
Log: logger,
Workspace: "default",
RepoRelDir: ".",
User: models.User{Username: "username"},
EscapedCommentArgs: []string{"comment", "args"},
ProjectName: "projectname",
Pull: models.PullRequest{
Num: 2,
},
BaseRepo: models.Repo{
FullName: "owner/repo",
Owner: "owner",
Name: "repo",
},
Workspace: "default",
RepoRelDir: ".",
}
defer cleanup()
client := &DefaultClient{
Expand Down