Skip to content

Commit

Permalink
Merge pull request #337 from hashicorp/sebasslash/multi-id-structs
Browse files Browse the repository at this point in the history
Refactor nested IDs into structs
  • Loading branch information
sebasslash committed Mar 1, 2022
2 parents 2948e27 + 453a665 commit 1b40f4a
Show file tree
Hide file tree
Showing 7 changed files with 524 additions and 131 deletions.
2 changes: 2 additions & 0 deletions generate_mocks.sh
Expand Up @@ -36,6 +36,7 @@ mockgen -source=policy_set_parameter.go -destination=mocks/policy_set_parameter_
mockgen -source=policy_set_version.go -destination=mocks/policy_set_version_mocks.go -package=mocks
mockgen -source=registry_module.go -destination=mocks/registry_module_mocks.go -package=mocks
mockgen -source=run.go -destination=mocks/run_mocks.go -package=mocks
mockgen -source=run_task.go -destination=mocks/run_tasks.go -package=mocks
mockgen -source=run_trigger.go -destination=mocks/run_trigger_mocks.go -package=mocks
mockgen -source=ssh_key.go -destination=mocks/ssh_key_mocks.go -package=mocks
mockgen -source=state_version.go -destination=mocks/state_version_mocks.go -package=mocks
Expand All @@ -49,3 +50,4 @@ mockgen -source=user.go -destination=mocks/user_mocks.go -package=mocks
mockgen -source=user_token.go -destination=mocks/user_token_mocks.go -package=mocks
mockgen -source=variable.go -destination=mocks/variable_mocks.go -package=mocks
mockgen -source=workspace.go -destination=mocks/workspace_mocks.go -package=mocks
mockgen -source=workspace_run_task.go -destination=mocks/workspace_run_tasks.go -package=mocks
9 changes: 7 additions & 2 deletions helper_test.go
Expand Up @@ -679,12 +679,17 @@ func createRegistryModuleWithVersion(t *testing.T, client *Client, org *Organiza
optionsModuleVersion := RegistryModuleCreateVersionOptions{
Version: String("1.0.0"),
}
_, err = client.RegistryModules.CreateVersion(ctx, org.Name, rm.Name, rm.Provider, optionsModuleVersion)
rmID := RegistryModuleID{
Organization: org.Name,
Name: rm.Name,
Provider: rm.Provider,
}
_, err = client.RegistryModules.CreateVersion(ctx, rmID, optionsModuleVersion)
if err != nil {
t.Fatal(err)
}

rm, err = client.RegistryModules.Read(ctx, org.Name, rm.Name, rm.Provider)
rm, err = client.RegistryModules.Read(ctx, rmID)
if err != nil {
t.Fatal(err)
}
Expand Down
32 changes: 16 additions & 16 deletions mocks/registry_module_mocks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

140 changes: 140 additions & 0 deletions mocks/run_tasks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

110 changes: 110 additions & 0 deletions mocks/workspace_run_tasks.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1b40f4a

Please sign in to comment.