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

Allowed modifying request headers via pre_create, pre_read, pre_update, or pre_delete custom code #17822

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Allowed modifying request headers via pre_create, pre_read, pre_update, or pre_delete custom code #17822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .changelog/10405.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none

```
7 changes: 7 additions & 0 deletions google/services/accessapproval/resource_folder_access_approval_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"bytes"
"fmt"
"log"
"net/http"
"reflect"
"strings"
"time"
Expand Down Expand Up @@ -221,6 +222,7 @@ func resourceAccessApprovalFolderSettingsCreate(d *schema.ResourceData, meta int
billingProject = bp
}

headers := make(http.Header)
updateMask := []string{}

if d.HasChange("notification_emails") {
Expand Down Expand Up @@ -248,6 +250,7 @@ func resourceAccessApprovalFolderSettingsCreate(d *schema.ResourceData, meta int
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutCreate),
Headers: headers,
})
if err != nil {
return fmt.Errorf("Error creating FolderSettings: %s", err)
Expand Down Expand Up @@ -287,12 +290,14 @@ func resourceAccessApprovalFolderSettingsRead(d *schema.ResourceData, meta inter
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: billingProject,
RawURL: url,
UserAgent: userAgent,
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("AccessApprovalFolderSettings %q", d.Id()))
Expand Down Expand Up @@ -358,6 +363,7 @@ func resourceAccessApprovalFolderSettingsUpdate(d *schema.ResourceData, meta int
}

log.Printf("[DEBUG] Updating FolderSettings %q: %#v", d.Id(), obj)
headers := make(http.Header)
updateMask := []string{}

if d.HasChange("notification_emails") {
Expand Down Expand Up @@ -393,6 +399,7 @@ func resourceAccessApprovalFolderSettingsUpdate(d *schema.ResourceData, meta int
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutUpdate),
Headers: headers,
})

if err != nil {
Expand Down
7 changes: 7 additions & 0 deletions google/services/accessapproval/resource_organization_access_approval_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package accessapproval
import (
"fmt"
"log"
"net/http"
"reflect"
"strings"
"time"
Expand Down Expand Up @@ -181,6 +182,7 @@ func resourceAccessApprovalOrganizationSettingsCreate(d *schema.ResourceData, me
billingProject = bp
}

headers := make(http.Header)
updateMask := []string{}

if d.HasChange("notification_emails") {
Expand Down Expand Up @@ -208,6 +210,7 @@ func resourceAccessApprovalOrganizationSettingsCreate(d *schema.ResourceData, me
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutCreate),
Headers: headers,
})
if err != nil {
return fmt.Errorf("Error creating OrganizationSettings: %s", err)
Expand Down Expand Up @@ -247,12 +250,14 @@ func resourceAccessApprovalOrganizationSettingsRead(d *schema.ResourceData, meta
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: billingProject,
RawURL: url,
UserAgent: userAgent,
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("AccessApprovalOrganizationSettings %q", d.Id()))
Expand Down Expand Up @@ -318,6 +323,7 @@ func resourceAccessApprovalOrganizationSettingsUpdate(d *schema.ResourceData, me
}

log.Printf("[DEBUG] Updating OrganizationSettings %q: %#v", d.Id(), obj)
headers := make(http.Header)
updateMask := []string{}

if d.HasChange("notification_emails") {
Expand Down Expand Up @@ -353,6 +359,7 @@ func resourceAccessApprovalOrganizationSettingsUpdate(d *schema.ResourceData, me
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutUpdate),
Headers: headers,
})

if err != nil {
Expand Down
7 changes: 7 additions & 0 deletions google/services/accessapproval/resource_project_access_approval_settings.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package accessapproval
import (
"fmt"
"log"
"net/http"
"reflect"
"strings"
"time"
Expand Down Expand Up @@ -195,6 +196,7 @@ func resourceAccessApprovalProjectSettingsCreate(d *schema.ResourceData, meta in
billingProject = bp
}

headers := make(http.Header)
updateMask := []string{}

if d.HasChange("notification_emails") {
Expand Down Expand Up @@ -226,6 +228,7 @@ func resourceAccessApprovalProjectSettingsCreate(d *schema.ResourceData, meta in
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutCreate),
Headers: headers,
})
if err != nil {
return fmt.Errorf("Error creating ProjectSettings: %s", err)
Expand Down Expand Up @@ -265,12 +268,14 @@ func resourceAccessApprovalProjectSettingsRead(d *schema.ResourceData, meta inte
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: billingProject,
RawURL: url,
UserAgent: userAgent,
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("AccessApprovalProjectSettings %q", d.Id()))
Expand Down Expand Up @@ -345,6 +350,7 @@ func resourceAccessApprovalProjectSettingsUpdate(d *schema.ResourceData, meta in
}

log.Printf("[DEBUG] Updating ProjectSettings %q: %#v", d.Id(), obj)
headers := make(http.Header)
updateMask := []string{}

if d.HasChange("notification_emails") {
Expand Down Expand Up @@ -384,6 +390,7 @@ func resourceAccessApprovalProjectSettingsUpdate(d *schema.ResourceData, meta in
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutUpdate),
Headers: headers,
})

if err != nil {
Expand Down
10 changes: 10 additions & 0 deletions google/services/accesscontextmanager/resource_access_context_manager_access_level.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package accesscontextmanager
import (
"fmt"
"log"
"net/http"
"reflect"
"strings"
"time"
Expand Down Expand Up @@ -387,6 +388,7 @@ func resourceAccessContextManagerAccessLevelCreate(d *schema.ResourceData, meta
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "POST",
Expand All @@ -395,6 +397,7 @@ func resourceAccessContextManagerAccessLevelCreate(d *schema.ResourceData, meta
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutCreate),
Headers: headers,
})
if err != nil {
return fmt.Errorf("Error creating AccessLevel: %s", err)
Expand Down Expand Up @@ -455,12 +458,14 @@ func resourceAccessContextManagerAccessLevelRead(d *schema.ResourceData, meta in
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: billingProject,
RawURL: url,
UserAgent: userAgent,
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("AccessContextManagerAccessLevel %q", d.Id()))
Expand Down Expand Up @@ -531,6 +536,7 @@ func resourceAccessContextManagerAccessLevelUpdate(d *schema.ResourceData, meta
}

log.Printf("[DEBUG] Updating AccessLevel %q: %#v", d.Id(), obj)
headers := make(http.Header)
updateMask := []string{}

if d.HasChange("title") {
Expand Down Expand Up @@ -570,6 +576,7 @@ func resourceAccessContextManagerAccessLevelUpdate(d *schema.ResourceData, meta
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutUpdate),
Headers: headers,
})

if err != nil {
Expand Down Expand Up @@ -611,6 +618,8 @@ func resourceAccessContextManagerAccessLevelDelete(d *schema.ResourceData, meta
billingProject = bp
}

headers := make(http.Header)

log.Printf("[DEBUG] Deleting AccessLevel %q", d.Id())
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Expand All @@ -620,6 +629,7 @@ func resourceAccessContextManagerAccessLevelDelete(d *schema.ResourceData, meta
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutDelete),
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, "AccessLevel")
Expand Down
8 changes: 8 additions & 0 deletions ...e/services/accesscontextmanager/resource_access_context_manager_access_level_condition.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package accesscontextmanager
import (
"fmt"
"log"
"net/http"
"reflect"
"time"

Expand Down Expand Up @@ -316,6 +317,7 @@ func resourceAccessContextManagerAccessLevelConditionCreate(d *schema.ResourceDa
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "PATCH",
Expand All @@ -324,6 +326,7 @@ func resourceAccessContextManagerAccessLevelConditionCreate(d *schema.ResourceDa
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutCreate),
Headers: headers,
})
if err != nil {
return fmt.Errorf("Error creating AccessLevelCondition: %s", err)
Expand Down Expand Up @@ -410,12 +413,14 @@ func resourceAccessContextManagerAccessLevelConditionRead(d *schema.ResourceData
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: billingProject,
RawURL: url,
UserAgent: userAgent,
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("AccessContextManagerAccessLevelCondition %q", d.Id()))
Expand Down Expand Up @@ -495,6 +500,8 @@ func resourceAccessContextManagerAccessLevelConditionDelete(d *schema.ResourceDa
billingProject = bp
}

headers := make(http.Header)

log.Printf("[DEBUG] Deleting AccessLevelCondition %q", d.Id())
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Expand All @@ -504,6 +511,7 @@ func resourceAccessContextManagerAccessLevelConditionDelete(d *schema.ResourceDa
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutDelete),
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, "AccessLevelCondition")
Expand Down
7 changes: 7 additions & 0 deletions google/services/accesscontextmanager/resource_access_context_manager_access_levels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package accesscontextmanager
import (
"fmt"
"log"
"net/http"
"reflect"
"time"

Expand Down Expand Up @@ -358,6 +359,7 @@ func resourceAccessContextManagerAccessLevelsCreate(d *schema.ResourceData, meta
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "POST",
Expand All @@ -366,6 +368,7 @@ func resourceAccessContextManagerAccessLevelsCreate(d *schema.ResourceData, meta
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutCreate),
Headers: headers,
})
if err != nil {
return fmt.Errorf("Error creating AccessLevels: %s", err)
Expand Down Expand Up @@ -412,12 +415,14 @@ func resourceAccessContextManagerAccessLevelsRead(d *schema.ResourceData, meta i
billingProject = bp
}

headers := make(http.Header)
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
Config: config,
Method: "GET",
Project: billingProject,
RawURL: url,
UserAgent: userAgent,
Headers: headers,
})
if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("AccessContextManagerAccessLevels %q", d.Id()))
Expand Down Expand Up @@ -453,6 +458,7 @@ func resourceAccessContextManagerAccessLevelsUpdate(d *schema.ResourceData, meta
}

log.Printf("[DEBUG] Updating AccessLevels %q: %#v", d.Id(), obj)
headers := make(http.Header)

// err == nil indicates that the billing_project value was found
if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
Expand All @@ -467,6 +473,7 @@ func resourceAccessContextManagerAccessLevelsUpdate(d *schema.ResourceData, meta
UserAgent: userAgent,
Body: obj,
Timeout: d.Timeout(schema.TimeoutUpdate),
Headers: headers,
})

if err != nil {
Expand Down
Loading