Skip to content

Commit

Permalink
Merge branch 'main' into mjyocca/runs-list-api-changelog
Browse files Browse the repository at this point in the history
  • Loading branch information
@brandonc
brandonc committed Jul 6, 2022
2 parents 1ada51a + 21015f0 commit ae26154
Show file tree
Hide file tree
Showing 71 changed files with 1,113 additions and 985 deletions.
4 changes: 2 additions & 2 deletions CHANGELOG.md
View file
Expand Up @@ -3,9 +3,9 @@
## Enhancements
* Adds `RetryServerErrors` field to the `Config` object by @sebasslash [#439](https://github.com/hashicorp/go-tfe/pull/439)
* Adds support for the GPG Keys API by @sebasslash [#429](https://github.com/hashicorp/go-tfe/pull/429)
* [beta] Renames the optional StateVersion field `ExtState` to `JSONState` and changes to string for base64 encoding by @annawinkler [#444](https://github.com/hashicorp/go-tfe/pull/444)
* Add support for new `WorkspaceLimit` Admin setting for organizations [#425](https://github.com/hashicorp/go-tfe/pull/425)
* [beta] Adds additional fields to `RunListOptions` by @mjyocca [#424](https://github.com/hashicorp/go-tfe/pull/424)
* [beta] Adds additional filter fields to `RunListOptions` by @mjyocca [#424](https://github.com/hashicorp/go-tfe/pull/424)
* [beta] Renames the optional StateVersion field `ExtState` to `JSONStateOutputs` and changes the purpose and type by @annawinkler [#444](https://github.com/hashicorp/go-tfe/pull/444) and @brandoncroft [#452](https://github.com/hashicorp/go-tfe/pull/452)

# v1.3.0

Expand Down
24 changes: 12 additions & 12 deletions admin_organization.go
View file
Expand Up @@ -107,13 +107,13 @@ func (s *adminOrganizations) List(ctx context.Context, options *AdminOrganizatio
return nil, err
}
u := "admin/organizations"
req, err := s.client.newRequest("GET", u, options)
req, err := s.client.NewRequest("GET", u, options)
if err != nil {
return nil, err
}

orgl := &AdminOrganizationList{}
err = s.client.do(ctx, req, orgl)
err = req.Do(ctx, orgl)
if err != nil {
return nil, err
}
Expand All @@ -129,13 +129,13 @@ func (s *adminOrganizations) ListModuleConsumers(ctx context.Context, organizati

u := fmt.Sprintf("admin/organizations/%s/relationships/module-consumers", url.QueryEscape(organization))

req, err := s.client.newRequest("GET", u, nil)
req, err := s.client.NewRequest("GET", u, nil)
if err != nil {
return nil, err
}

orgl := &AdminOrganizationList{}
err = s.client.do(ctx, req, orgl)
err = req.Do(ctx, orgl)
if err != nil {
return nil, err
}
Expand All @@ -150,13 +150,13 @@ func (s *adminOrganizations) Read(ctx context.Context, organization string) (*Ad
}

u := fmt.Sprintf("admin/organizations/%s", url.QueryEscape(organization))
req, err := s.client.newRequest("GET", u, nil)
req, err := s.client.NewRequest("GET", u, nil)
if err != nil {
return nil, err
}

org := &AdminOrganization{}
err = s.client.do(ctx, req, org)
err = req.Do(ctx, org)
if err != nil {
return nil, err
}
Expand All @@ -171,13 +171,13 @@ func (s *adminOrganizations) Update(ctx context.Context, organization string, op
}

u := fmt.Sprintf("admin/organizations/%s", url.QueryEscape(organization))
req, err := s.client.newRequest("PATCH", u, &options)
req, err := s.client.NewRequest("PATCH", u, &options)
if err != nil {
return nil, err
}

org := &AdminOrganization{}
err = s.client.do(ctx, req, org)
err = req.Do(ctx, org)
if err != nil {
return nil, err
}
Expand All @@ -201,12 +201,12 @@ func (s *adminOrganizations) UpdateModuleConsumers(ctx context.Context, organiza
organizations = append(organizations, &AdminOrganizationID{ID: id})
}

req, err := s.client.newRequest("PATCH", u, organizations)
req, err := s.client.NewRequest("PATCH", u, organizations)
if err != nil {
return err
}

err = s.client.do(ctx, req, nil)
err = req.Do(ctx, nil)
if err != nil {
return err
}
Expand All @@ -221,12 +221,12 @@ func (s *adminOrganizations) Delete(ctx context.Context, organization string) er
}

u := fmt.Sprintf("admin/organizations/%s", url.QueryEscape(organization))
req, err := s.client.newRequest("DELETE", u, nil)
req, err := s.client.NewRequest("DELETE", u, nil)
if err != nil {
return err
}

return s.client.do(ctx, req, nil)
return req.Do(ctx, nil)
}

func (o *AdminOrganizationListOptions) valid() error {
Expand Down
8 changes: 4 additions & 4 deletions admin_run.go
View file
Expand Up @@ -78,13 +78,13 @@ func (s *adminRuns) List(ctx context.Context, options *AdminRunsListOptions) (*A
}

u := "admin/runs"
req, err := s.client.newRequest("GET", u, options)
req, err := s.client.NewRequest("GET", u, options)
if err != nil {
return nil, err
}

rl := &AdminRunsList{}
err = s.client.do(ctx, req, rl)
err = req.Do(ctx, rl)
if err != nil {
return nil, err
}
Expand All @@ -107,12 +107,12 @@ func (s *adminRuns) ForceCancel(ctx context.Context, runID string, options Admin
}

u := fmt.Sprintf("admin/runs/%s/actions/force-cancel", url.QueryEscape(runID))
req, err := s.client.newRequest("POST", u, &options)
req, err := s.client.NewRequest("POST", u, &options)
if err != nil {
return err
}

return s.client.do(ctx, req, nil)
return req.Do(ctx, nil)
}

func (o *AdminRunsListOptions) valid() error {
Expand Down
8 changes: 4 additions & 4 deletions admin_setting_cost_estimation.go
View file
Expand Up @@ -54,13 +54,13 @@ type AdminCostEstimationSettingOptions struct {

// Read returns the cost estimation settings.
func (a *adminCostEstimationSettings) Read(ctx context.Context) (*AdminCostEstimationSetting, error) {
req, err := a.client.newRequest("GET", "admin/cost-estimation-settings", nil)
req, err := a.client.NewRequest("GET", "admin/cost-estimation-settings", nil)
if err != nil {
return nil, err
}

ace := &AdminCostEstimationSetting{}
err = a.client.do(ctx, req, ace)
err = req.Do(ctx, ace)
if err != nil {
return nil, err
}
Expand All @@ -70,13 +70,13 @@ func (a *adminCostEstimationSettings) Read(ctx context.Context) (*AdminCostEstim

// Update updates the cost-estimation settings.
func (a *adminCostEstimationSettings) Update(ctx context.Context, options AdminCostEstimationSettingOptions) (*AdminCostEstimationSetting, error) {
req, err := a.client.newRequest("PATCH", "admin/cost-estimation-settings", &options)
req, err := a.client.NewRequest("PATCH", "admin/cost-estimation-settings", &options)
if err != nil {
return nil, err
}

ace := &AdminCostEstimationSetting{}
err = a.client.do(ctx, req, ace)
err = req.Do(ctx, ace)
if err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions admin_setting_customization.go
View file
Expand Up @@ -33,13 +33,13 @@ type AdminCustomizationSetting struct {

// Read returns the Customization settings.
func (a *adminCustomizationSettings) Read(ctx context.Context) (*AdminCustomizationSetting, error) {
req, err := a.client.newRequest("GET", "admin/customization-settings", nil)
req, err := a.client.NewRequest("GET", "admin/customization-settings", nil)
if err != nil {
return nil, err
}

cs := &AdminCustomizationSetting{}
err = a.client.do(ctx, req, cs)
err = req.Do(ctx, cs)
if err != nil {
return nil, err
}
Expand All @@ -60,13 +60,13 @@ type AdminCustomizationSettingsUpdateOptions struct {

// Update updates the customization settings.
func (a *adminCustomizationSettings) Update(ctx context.Context, options AdminCustomizationSettingsUpdateOptions) (*AdminCustomizationSetting, error) {
req, err := a.client.newRequest("PATCH", "admin/customization-settings", &options)
req, err := a.client.NewRequest("PATCH", "admin/customization-settings", &options)
if err != nil {
return nil, err
}

cs := &AdminCustomizationSetting{}
err = a.client.do(ctx, req, cs)
err = req.Do(ctx, cs)
if err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions admin_setting_general.go
View file
Expand Up @@ -54,13 +54,13 @@ type AdminGeneralSettingsUpdateOptions struct {

// Read returns the general settings.
func (a *adminGeneralSettings) Read(ctx context.Context) (*AdminGeneralSetting, error) {
req, err := a.client.newRequest("GET", "admin/general-settings", nil)
req, err := a.client.NewRequest("GET", "admin/general-settings", nil)
if err != nil {
return nil, err
}

ags := &AdminGeneralSetting{}
err = a.client.do(ctx, req, ags)
err = req.Do(ctx, ags)
if err != nil {
return nil, err
}
Expand All @@ -70,13 +70,13 @@ func (a *adminGeneralSettings) Read(ctx context.Context) (*AdminGeneralSetting,

// Update updates the general settings.
func (a *adminGeneralSettings) Update(ctx context.Context, options AdminGeneralSettingsUpdateOptions) (*AdminGeneralSetting, error) {
req, err := a.client.newRequest("PATCH", "admin/general-settings", &options)
req, err := a.client.NewRequest("PATCH", "admin/general-settings", &options)
if err != nil {
return nil, err
}

ags := &AdminGeneralSetting{}
err = a.client.do(ctx, req, ags)
err = req.Do(ctx, ags)
if err != nil {
return nil, err
}
Expand Down
12 changes: 6 additions & 6 deletions admin_setting_saml.go
View file
Expand Up @@ -50,13 +50,13 @@ type AdminSAMLSetting struct {

// Read returns the SAML settings.
func (a *adminSAMLSettings) Read(ctx context.Context) (*AdminSAMLSetting, error) {
req, err := a.client.newRequest("GET", "admin/saml-settings", nil)
req, err := a.client.NewRequest("GET", "admin/saml-settings", nil)
if err != nil {
return nil, err
}

saml := &AdminSAMLSetting{}
err = a.client.do(ctx, req, saml)
err = req.Do(ctx, saml)
if err != nil {
return nil, err
}
Expand All @@ -82,13 +82,13 @@ type AdminSAMLSettingsUpdateOptions struct {

// Update updates the SAML settings.
func (a *adminSAMLSettings) Update(ctx context.Context, options AdminSAMLSettingsUpdateOptions) (*AdminSAMLSetting, error) {
req, err := a.client.newRequest("PATCH", "admin/saml-settings", &options)
req, err := a.client.NewRequest("PATCH", "admin/saml-settings", &options)
if err != nil {
return nil, err
}

saml := &AdminSAMLSetting{}
err = a.client.do(ctx, req, saml)
err = req.Do(ctx, saml)
if err != nil {
return nil, err
}
Expand All @@ -99,13 +99,13 @@ func (a *adminSAMLSettings) Update(ctx context.Context, options AdminSAMLSetting
// RevokeIdpCert revokes the older IdP certificate when the new IdP
// certificate is known to be functioning correctly.
func (a *adminSAMLSettings) RevokeIdpCert(ctx context.Context) (*AdminSAMLSetting, error) {
req, err := a.client.newRequest("POST", "admin/saml-settings/actions/revoke-old-certificate", nil)
req, err := a.client.NewRequest("POST", "admin/saml-settings/actions/revoke-old-certificate", nil)
if err != nil {
return nil, err
}

saml := &AdminSAMLSetting{}
err = a.client.do(ctx, req, saml)
err = req.Do(ctx, saml)
if err != nil {
return nil, err
}
Expand Down
8 changes: 4 additions & 4 deletions admin_setting_smtp.go
View file
Expand Up @@ -43,13 +43,13 @@ type AdminSMTPSetting struct {

// Read returns the SMTP settings.
func (a *adminSMTPSettings) Read(ctx context.Context) (*AdminSMTPSetting, error) {
req, err := a.client.newRequest("GET", "admin/smtp-settings", nil)
req, err := a.client.NewRequest("GET", "admin/smtp-settings", nil)
if err != nil {
return nil, err
}

smtp := &AdminSMTPSetting{}
err = a.client.do(ctx, req, smtp)
err = req.Do(ctx, smtp)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -77,13 +77,13 @@ func (a *adminSMTPSettings) Update(ctx context.Context, options AdminSMTPSetting
return nil, err
}

req, err := a.client.newRequest("PATCH", "admin/smtp-settings", &options)
req, err := a.client.NewRequest("PATCH", "admin/smtp-settings", &options)
if err != nil {
return nil, err
}

smtp := &AdminSMTPSetting{}
err = a.client.do(ctx, req, smtp)
err = req.Do(ctx, smtp)
if err != nil {
return nil, err
}
Expand Down
12 changes: 6 additions & 6 deletions admin_setting_twilio.go
View file
Expand Up @@ -34,13 +34,13 @@ type AdminTwilioSetting struct {

// Read returns the Twilio settings.
func (a *adminTwilioSettings) Read(ctx context.Context) (*AdminTwilioSetting, error) {
req, err := a.client.newRequest("GET", "admin/twilio-settings", nil)
req, err := a.client.NewRequest("GET", "admin/twilio-settings", nil)
if err != nil {
return nil, err
}

twilio := &AdminTwilioSetting{}
err = a.client.do(ctx, req, twilio)
err = req.Do(ctx, twilio)
if err != nil {
return nil, err
}
Expand All @@ -66,13 +66,13 @@ type AdminTwilioSettingsVerifyOptions struct {

// Update updates the Twilio settings.
func (a *adminTwilioSettings) Update(ctx context.Context, options AdminTwilioSettingsUpdateOptions) (*AdminTwilioSetting, error) {
req, err := a.client.newRequest("PATCH", "admin/twilio-settings", &options)
req, err := a.client.NewRequest("PATCH", "admin/twilio-settings", &options)
if err != nil {
return nil, err
}

twilio := &AdminTwilioSetting{}
err = a.client.do(ctx, req, twilio)
err = req.Do(ctx, twilio)
if err != nil {
return nil, err
}
Expand All @@ -85,12 +85,12 @@ func (a *adminTwilioSettings) Verify(ctx context.Context, options AdminTwilioSet
if err := options.valid(); err != nil {
return err
}
req, err := a.client.newRequest("PATCH", "admin/twilio-settings/verify", &options)
req, err := a.client.NewRequest("PATCH", "admin/twilio-settings/verify", &options)
if err != nil {
return err
}

return a.client.do(ctx, req, nil)
return req.Do(ctx, nil)
}

func (o AdminTwilioSettingsVerifyOptions) valid() error {
Expand Down

0 comments on commit ae26154

Please sign in to comment.