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

Support of Transaction-Id #3518

Merged
merged 2 commits into from
May 19, 2022
Merged

Support of Transaction-Id #3518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fc8110
Support of Transaction-Id
Rajesh-Pirati Jan 24, 2022
d9da07d
Fix testcase failure and added missing code after rebase. Incorporate…
Rajesh-Pirati Apr 26, 2022
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
18 changes: 17 additions & 1 deletion ibm/service/iampolicy/data_source_ibm_iam_access_group_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ func DataSourceIBMIAMAccessGroupPolicy() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"transaction_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Set transactionID for debug",
},
"policies": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -149,8 +155,13 @@ func dataSourceIBMIAMAccessGroupPolicyRead(d *schema.ResourceData, meta interfac
listPoliciesOptions.Sort = core.StringPtr(v.(string))
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
listPoliciesOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

policyList, resp, err := iamPolicyManagementClient.ListPolicies(listPoliciesOptions)
if err != nil {

if err != nil || resp == nil {
return fmt.Errorf("Error listing access group policies: %s, %s", err, resp)
}

Expand All @@ -174,6 +185,11 @@ func dataSourceIBMIAMAccessGroupPolicyRead(d *schema.ResourceData, meta interfac
accessGroupPolicies = append(accessGroupPolicies, p)
}
d.SetId(accessGroupId)

if len(resp.Headers["Transaction-Id"]) > 0 && resp.Headers["Transaction-Id"][0] != "" {
d.Set("transaction_id", resp.Headers["Transaction-Id"][0])
}

d.Set("policies", accessGroupPolicies)

return nil
Expand Down
17 changes: 16 additions & 1 deletion ibm/service/iampolicy/data_source_ibm_iam_authorization_policies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ func DataSourceIBMIAMAuthorizationPolicies() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"transaction_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Set transactionID for debug",
},
"policies": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -146,9 +152,13 @@ func dataSourceIBMIAMAuthorizationPoliciesRead(d *schema.ResourceData, meta inte
listPoliciesOptions.Sort = core.StringPtr(v.(string))
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
listPoliciesOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

policyList, resp, err := iamPolicyManagementClient.ListPolicies(listPoliciesOptions)

if err != nil {
if err != nil || resp == nil {
return fmt.Errorf("[ERROR] Error listing authorization policies: %s, %s", err, resp)
}

Expand Down Expand Up @@ -184,6 +194,11 @@ func dataSourceIBMIAMAuthorizationPoliciesRead(d *schema.ResourceData, meta inte

d.SetId(time.Now().UTC().String())
d.Set("account_id", accountID)

if len(resp.Headers["Transaction-Id"]) > 0 && resp.Headers["Transaction-Id"][0] != "" {
d.Set("transaction_id", resp.Headers["Transaction-Id"][0])
}

d.Set("policies", authorizationPolicies)

return nil
Expand Down
17 changes: 15 additions & 2 deletions ibm/service/iampolicy/data_source_ibm_iam_service_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ func DataSourceIBMIAMServicePolicy() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"transaction_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Set transactionID for debug",
},
"policies": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -147,7 +153,7 @@ func dataSourceIBMIAMServicePolicyRead(d *schema.ResourceData, meta interface{})
ID: &serviceIDUUID,
}
serviceID, resp, err := iamClient.GetServiceID(&getServiceIDOptions)
if err != nil {
if err != nil || resp == nil {
return fmt.Errorf("[ERROR] Error] Error Getting Service Id %s %s", err, resp)
}
iamID = *serviceID.IamID
Expand Down Expand Up @@ -176,13 +182,17 @@ func dataSourceIBMIAMServicePolicyRead(d *schema.ResourceData, meta interface{})
listPoliciesOptions.Sort = core.StringPtr(v.(string))
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
listPoliciesOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

policyList, resp, err := iamPolicyManagementClient.ListPolicies(listPoliciesOptions)

if err != nil {
return fmt.Errorf("Error listing service policies: %s, %s", err, resp)
}
policies := policyList.Policies

policies := policyList.Policies
servicePolicies := make([]map[string]interface{}, 0, len(policies))
for _, policy := range policies {
roles := make([]string, len(policy.Roles))
Expand Down Expand Up @@ -215,6 +225,9 @@ func dataSourceIBMIAMServicePolicyRead(d *schema.ResourceData, meta interface{})
iamID := v.(string)
d.SetId(iamID)
}
if len(resp.Headers["Transaction-Id"]) > 0 && resp.Headers["Transaction-Id"][0] != "" {
d.Set("transaction_id", resp.Headers["Transaction-Id"][0])
}
d.Set("policies", servicePolicies)
return nil
}
16 changes: 15 additions & 1 deletion ibm/service/iampolicy/data_source_ibm_iam_trusted_profile_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ func DataSourceIBMIAMTrustedProfilePolicy() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"transaction_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Set transactionID for debug",
},
"policies": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -176,8 +182,13 @@ func dataSourceIBMIAMTrustedProfilePolicyRead(d *schema.ResourceData, meta inter
listPoliciesOptions.Sort = core.StringPtr(v.(string))
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
listPoliciesOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

policyList, resp, err := iamPolicyManagementClient.ListPolicies(listPoliciesOptions)
if err != nil {

if err != nil || resp == nil {
return fmt.Errorf("Error listing trusted profile policies: %s, %s", err, resp)
}

Expand Down Expand Up @@ -214,6 +225,9 @@ func dataSourceIBMIAMTrustedProfilePolicyRead(d *schema.ResourceData, meta inter
iamID := v.(string)
d.SetId(iamID)
}
if len(resp.Headers["Transaction-Id"]) > 0 && resp.Headers["Transaction-Id"][0] != "" {
d.Set("transaction_id", resp.Headers["Transaction-Id"][0])
}
d.Set("policies", profilePolicies)
return nil
}
17 changes: 15 additions & 2 deletions ibm/service/iampolicy/data_source_ibm_iam_user_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ func DataSourceIBMIAMUserPolicy() *schema.Resource {
Type: schema.TypeString,
Optional: true,
},
"transaction_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Set transactionID for debug",
},
"policies": {
Type: schema.TypeList,
Computed: true,
Expand Down Expand Up @@ -154,13 +160,17 @@ func dataSourceIBMIAMUserPolicyRead(d *schema.ResourceData, meta interface{}) er
listPoliciesOptions.Sort = core.StringPtr(v.(string))
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
listPoliciesOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

policyList, resp, err := iamPolicyManagementClient.ListPolicies(listPoliciesOptions)

if err != nil {
if err != nil || resp == nil {
return fmt.Errorf("Error listing user policies: %s, %s", err, resp)
}
policies := policyList.Policies

policies := policyList.Policies
userPolicies := make([]map[string]interface{}, 0, len(policies))
for _, policy := range policies {
roles := make([]string, len(policy.Roles))
Expand All @@ -179,6 +189,9 @@ func dataSourceIBMIAMUserPolicyRead(d *schema.ResourceData, meta interface{}) er
}
userPolicies = append(userPolicies, p)
}
if len(resp.Headers["Transaction-Id"]) > 0 && resp.Headers["Transaction-Id"][0] != "" {
d.Set("transaction_id", resp.Headers["Transaction-Id"][0])
}
d.SetId(userEmail)
d.Set("policies", userPolicies)

Expand Down
34 changes: 33 additions & 1 deletion ibm/service/iampolicy/resource_ibm_iam_access_group_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,13 @@ func ResourceIBMIAMAccessGroupPolicy() *schema.Resource {
Description: "Description of the Policy",
},

"transaction_id": {
Type: schema.TypeString,
Optional: true,
Computed: true,
Description: "Set transactionID for debug",
},

"version": {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -240,6 +247,10 @@ func resourceIBMIAMAccessGroupPolicyCreate(d *schema.ResourceData, meta interfac
createPolicyOptions.Description = &des
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
createPolicyOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

accessGroupPolicy, res, err := iamPolicyManagementClient.CreatePolicy(createPolicyOptions)
if err != nil || accessGroupPolicy == nil {
return fmt.Errorf("[ERROR] Error creating access group policy: %s\n%s", err, res)
Expand All @@ -249,6 +260,10 @@ func resourceIBMIAMAccessGroupPolicyCreate(d *schema.ResourceData, meta interfac
PolicyID: accessGroupPolicy.ID,
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
getPolicyOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

err = resource.Retry(5*time.Minute, func() *resource.RetryError {
var err error
policy, res, err := iamPolicyManagementClient.GetPolicy(getPolicyOptions)
Expand Down Expand Up @@ -290,6 +305,11 @@ func resourceIBMIAMAccessGroupPolicyRead(d *schema.ResourceData, meta interface{
getPolicyOptions := &iampolicymanagementv1.GetPolicyOptions{
PolicyID: &accessGroupPolicyId,
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
getPolicyOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

accessGroupPolicy := &iampolicymanagementv1.Policy{}
res := &core.DetailedResponse{}
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
Expand All @@ -307,7 +327,7 @@ func resourceIBMIAMAccessGroupPolicyRead(d *schema.ResourceData, meta interface{
if conns.IsResourceTimeoutError(err) {
accessGroupPolicy, res, err = iamPolicyManagementClient.GetPolicy(getPolicyOptions)
}
if err != nil || accessGroupPolicy == nil {
if err != nil || accessGroupPolicy == nil || res == nil {
return fmt.Errorf("[ERROR] Error retrieving access group policy: %s\n%s", err, res)
}

Expand Down Expand Up @@ -348,6 +368,10 @@ func resourceIBMIAMAccessGroupPolicyRead(d *schema.ResourceData, meta interface{
d.Set("description", *accessGroupPolicy.Description)
}

if len(res.Headers["Transaction-Id"]) > 0 && res.Headers["Transaction-Id"][0] != "" {
d.Set("transaction_id", res.Headers["Transaction-Id"][0])
}

return nil
}

Expand Down Expand Up @@ -409,6 +433,10 @@ func resourceIBMIAMAccessGroupPolicyUpdate(d *schema.ResourceData, meta interfac
updatePolicyOptions.Description = &des
}

if transactionID, ok := d.GetOk("transaction_id"); ok {
updatePolicyOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

_, res, err := iamPolicyManagementClient.UpdatePolicy(updatePolicyOptions)
if err != nil {
return fmt.Errorf("[ERROR] Error updating access group policy: %s\n%s", err, res)
Expand All @@ -435,6 +463,10 @@ func resourceIBMIAMAccessGroupPolicyDelete(d *schema.ResourceData, meta interfac
accessGroupPolicyId,
)

if transactionID, ok := d.GetOk("transaction_id"); ok {
deletePolicyOptions.SetHeaders(map[string]string{"Transaction-Id": transactionID.(string)})
}

res, err := iamPolicyManagementClient.DeletePolicy(deletePolicyOptions)
if err != nil {
return fmt.Errorf("[ERROR] Error deleting access group policy: %s\n%s", err, res)
Expand Down
Loading