Skip to content

Commit

Permalink
Merge pull request #128 from hashicorp/tobias/update-hcp-sdk-go
Browse files Browse the repository at this point in the history
Update hcp-sdk-go
  • Loading branch information
catsby authored Jul 10, 2024
2 parents 8d6ff8b + 63c11b7 commit 3e8c6e8
Show file tree
Hide file tree
Showing 8 changed files with 1,272 additions and 372 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ROOT_DIR = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
# is run, the existing mocks will be deleted and new ones will be generated. If
# the mock file is generated in the same package as the actual implementation,
# store the mock file in MOCKERY_OUTPUT_FILES.
MOCKERY_DIRS=./ internal/commands/auth/ internal/pkg/api/iampolicy
MOCKERY_DIRS=./ internal/commands/auth/ internal/pkg/api/iampolicy internal/pkg/api/releasesapi
MOCKERY_OUTPUT_DIRS=internal/pkg/api/mocks internal/commands/auth/mocks internal/pkg/api/releasesapi/mocks
MOCKERY_OUTPUT_FILES=internal/pkg/api/iampolicy/mock_setter.go \
internal/pkg/api/iampolicy/mock_resource_updater.go
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/hcl/v2 v2.19.1
github.com/hashicorp/hcp-sdk-go v0.96.0
github.com/hashicorp/hcp-sdk-go v0.102.0
github.com/lithammer/dedent v1.1.0
github.com/manifoldco/promptui v0.9.0
github.com/mitchellh/cli v1.1.5
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mO
github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
github.com/hashicorp/hcl/v2 v2.19.1 h1://i05Jqznmb2EXqa39Nsvyan2o5XyMowW5fnCKW5RPI=
github.com/hashicorp/hcl/v2 v2.19.1/go.mod h1:ThLC89FV4p9MPW804KVbe/cEXoQ8NZEh+JtMeeGErHE=
github.com/hashicorp/hcp-sdk-go v0.96.0 h1:7oI993ZN7HG7TiFg00r2Po1N5mZZryOtSX0Ec/8cCQ4=
github.com/hashicorp/hcp-sdk-go v0.96.0/go.mod h1:vQ4fzdL1AmhIAbCw+4zmFe5Hbpajj3NvRWkJoVuxmAk=
github.com/hashicorp/hcp-sdk-go v0.102.0 h1:T3iExnfSlZDYdJIPSaR2pkmHUgM/wuisXldc//6Y4do=
github.com/hashicorp/hcp-sdk-go v0.102.0/go.mod h1:vQ4fzdL1AmhIAbCw+4zmFe5Hbpajj3NvRWkJoVuxmAk=
github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE=
Expand Down
10 changes: 4 additions & 6 deletions internal/commands/projects/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,10 @@ func addToBillingAccount(opts *CreateOpts, projectID string) error {
updateReq := billing_account_service.NewBillingAccountServiceUpdateParams()
updateReq.OrganizationID = ba.OrganizationID
updateReq.ID = ba.ID
updateReq.Body = &billingModels.Billing20201105UpdateBillingAccountRequest{
OrganizationID: opts.Profile.OrganizationID,
ID: ba.ID,
ProjectIds: ba.ProjectIds,
Name: ba.Name,
Country: ba.Country,
updateReq.Body = &billingModels.BillingAccountServiceUpdateBody{
ProjectIds: ba.ProjectIds,
Name: ba.Name,
Country: ba.Country,
}

updateReq.Body.ProjectIds = append(updateReq.Body.ProjectIds, projectID)
Expand Down

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

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

Loading

0 comments on commit 3e8c6e8

Please sign in to comment.