Skip to content

skip service-id and trusted-profile-id validation when creating policies #6336

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+146 −396
Draft

skip service-id and trusted-profile-id validation when creating policies #6336

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ibm/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2184,9 +2184,7 @@ func Validator() validate.ValidatorDict {
"ibm_iam_service_api_key": iamidentity.ResourceIBMIAMServiceAPIKeyValidator(),
"ibm_iam_trusted_profile_identity": iamidentity.ResourceIBMIamTrustedProfileIdentityValidator(),

"ibm_iam_trusted_profile_policy": iampolicy.ResourceIBMIAMTrustedProfilePolicyValidator(),
"ibm_iam_access_group_policy": iampolicy.ResourceIBMIAMAccessGroupPolicyValidator(),
"ibm_iam_service_policy": iampolicy.ResourceIBMIAMServicePolicyValidator(),
"ibm_iam_authorization_policy": iampolicy.ResourceIBMIAMAuthorizationPolicyValidator(),
"ibm_iam_policy_template": iampolicy.ResourceIBMIAMPolicyTemplateValidator(),
"ibm_iam_policy_template_version": iampolicy.ResourceIBMIAMPolicyTemplateVersionValidator(),
Expand Down Expand Up @@ -2330,9 +2328,7 @@ func Validator() validate.ValidatorDict {
"ibm_iam_trusted_profile": iamidentity.DataSourceIBMIamTrustedProfileValidator(),
"ibm_iam_trusted_profile_claim_rules": iamidentity.DataSourceIBMIamTrustedProfileClaimRulesValidator(),

"ibm_iam_access_group_policy": iampolicy.DataSourceIBMIAMAccessGroupPolicyValidator(),
"ibm_iam_service_policy": iampolicy.DataSourceIBMIAMServicePolicyValidator(),
"ibm_iam_trusted_profile_policy": iampolicy.DataSourceIBMIAMTrustedProfilePolicyValidator(),
"ibm_iam_access_group_policy": iampolicy.DataSourceIBMIAMAccessGroupPolicyValidator(),
},
}
})
Expand Down
57 changes: 5 additions & 52 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 @@ -8,11 +8,9 @@ import (

"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

"github.com/IBM/go-sdk-core/v5/core"
"github.com/IBM/platform-services-go-sdk/iamidentityv1"
"github.com/IBM/platform-services-go-sdk/iampolicymanagementv1"
)

Expand All @@ -22,19 +20,10 @@ func DataSourceIBMIAMServicePolicy() *schema.Resource {
Read: dataSourceIBMIAMServicePolicyRead,

Schema: map[string]*schema.Schema{
"iam_service_id": {
Type: schema.TypeString,
Optional: true,
ExactlyOneOf: []string{"iam_service_id", "iam_id"},
Description: "UUID of ServiceID",
ValidateFunc: validate.InvokeDataSourceValidator("ibm_iam_service_policy",
"iam_service_id"),
},
"iam_id": {
Type: schema.TypeString,
Optional: true,
ExactlyOneOf: []string{"iam_service_id", "iam_id"},
Description: "IAM ID of ServiceID",
Type: schema.TypeString,
Required: true,
Description: "IAM ID of ServiceID",
},
"sort": {
Description: "Sort query for policies",
Expand Down Expand Up @@ -212,40 +201,10 @@ func DataSourceIBMIAMServicePolicy() *schema.Resource {
},
}
}
func DataSourceIBMIAMServicePolicyValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "iam_service_id",
ValidateFunctionIdentifier: validate.ValidateCloudData,
Type: validate.TypeString,
CloudDataType: "iam",
CloudDataRange: []string{"service:service_id", "resolved_to:id"},
Optional: true})

iBMIAMServicePolicyValidator := validate.ResourceValidator{ResourceName: "ibm_iam_service_policy", Schema: validateSchema}
return &iBMIAMServicePolicyValidator
}

func dataSourceIBMIAMServicePolicyRead(d *schema.ResourceData, meta interface{}) error {

var iamID string
if v, ok := d.GetOk("iam_service_id"); ok && v != nil {

serviceIDUUID := v.(string)
iamClient, err := meta.(conns.ClientSession).IAMIdentityV1API()
if err != nil {
return err
}
getServiceIDOptions := iamidentityv1.GetServiceIDOptions{
ID: &serviceIDUUID,
}
serviceID, resp, err := iamClient.GetServiceID(&getServiceIDOptions)
if err != nil || resp == nil {
return fmt.Errorf("[ERROR] Error] Error Getting Service Id %s %s", err, resp)
}
iamID = *serviceID.IamID
}
if v, ok := d.GetOk("iam_id"); ok && v != nil {
iamID = v.(string)
}
Expand Down Expand Up @@ -293,10 +252,7 @@ func dataSourceIBMIAMServicePolicyRead(d *schema.ResourceData, meta interface{})
"resources": resources,
"resource_tags": flex.FlattenV2PolicyResourceTags(*policy.Resource),
}
if v, ok := d.GetOk("iam_service_id"); ok && v != nil {
serviceIDUUID := v.(string)
p["id"] = fmt.Sprintf("%s/%s", serviceIDUUID, *policy.ID)
} else if v, ok := d.GetOk("iam_id"); ok && v != nil {
if v, ok := d.GetOk("iam_id"); ok && v != nil {
iamID := v.(string)
p["id"] = fmt.Sprintf("%s/%s", iamID, *policy.ID)
}
Expand All @@ -315,10 +271,7 @@ func dataSourceIBMIAMServicePolicyRead(d *schema.ResourceData, meta interface{})
servicePolicies = append(servicePolicies, p)
}

if v, ok := d.GetOk("iam_service_id"); ok && v != nil {
serviceIDUUID := v.(string)
d.SetId(serviceIDUUID)
} else if v, ok := d.GetOk("iam_id"); ok && v != nil {
if v, ok := d.GetOk("iam_id"); ok && v != nil {
iamID := v.(string)
d.SetId(iamID)
}
Expand Down
28 changes: 14 additions & 14 deletions ibm/service/iampolicy/data_source_ibm_iam_service_policy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ resource "ibm_resource_instance" "instance" {
}

resource "ibm_iam_service_policy" "policy" {
iam_service_id = ibm_iam_service_id.serviceID.id
iam_id = ibm_iam_service_id.serviceID.iam_id
roles = ["Manager", "Viewer", "Administrator"]

resources {
Expand All @@ -141,7 +141,7 @@ resource "ibm_iam_service_policy" "policy" {
}

data "ibm_iam_service_policy" "testacc_ds_service_policy" {
iam_service_id = ibm_iam_service_policy.policy.iam_service_id
iam_id = ibm_iam_service_policy.policy.iam_id
}`, name, name)

}
Expand All @@ -162,7 +162,7 @@ resource "ibm_resource_instance" "instance" {
}

resource "ibm_iam_service_policy" "policy" {
iam_service_id = ibm_iam_service_id.serviceID.id
iam_id = ibm_iam_service_id.serviceID.iam_id
roles = ["Manager", "Viewer", "Administrator"]

resources {
Expand All @@ -176,7 +176,7 @@ data "ibm_resource_group" "group" {
}

resource "ibm_iam_service_policy" "policy1" {
iam_service_id = ibm_iam_service_id.serviceID.id
iam_id = ibm_iam_service_id.serviceID.iam_id
roles = ["Viewer"]

resources {
Expand All @@ -187,8 +187,8 @@ resource "ibm_iam_service_policy" "policy1" {


data "ibm_iam_service_policy" "testacc_ds_service_policy" {
iam_service_id = ibm_iam_service_policy.policy.iam_service_id
sort = "id"
iam_id = ibm_iam_service_policy.policy.iam_id
sort = "created_at"
}`, name, name)

}
Expand All @@ -202,7 +202,7 @@ resource "ibm_iam_service_id" "serviceID" {
}

resource "ibm_iam_service_policy" "policy" {
iam_service_id = ibm_iam_service_id.serviceID.id
iam_id = ibm_iam_service_id.serviceID.iam_id
roles = ["Manager", "Viewer", "Administrator"]

resource_attributes {
Expand All @@ -217,7 +217,7 @@ resource "ibm_iam_service_policy" "policy" {
}

data "ibm_iam_service_policy" "testacc_ds_service_policy" {
iam_service_id = ibm_iam_service_policy.policy.iam_service_id
iam_id = ibm_iam_service_policy.policy.iam_id
}`, name)

}
Expand All @@ -232,7 +232,7 @@ func testAccCheckIBMIAMServicePolicyDataSourceTimeBasedWeekly(name string) strin
}

resource "ibm_iam_service_policy" "policy" {
iam_service_id = ibm_iam_service_id.serviceID.id
iam_id = ibm_iam_service_id.serviceID.iam_id
roles = ["Viewer"]
resources {
service = "kms"
Expand All @@ -246,7 +246,7 @@ func testAccCheckIBMIAMServicePolicyDataSourceTimeBasedWeekly(name string) strin
}

data "ibm_iam_service_policy" "testacc_ds_service_policy" {
iam_service_id = ibm_iam_service_policy.policy.iam_service_id
iam_id = ibm_iam_service_policy.policy.iam_id
}
`, name)
}
Expand All @@ -261,7 +261,7 @@ func testAccCheckIBMIAMServicePolicyDataSourceTimeBasedCustom(name string) strin
}

resource "ibm_iam_service_policy" "policy" {
iam_service_id = ibm_iam_service_id.serviceID.id
iam_id = ibm_iam_service_id.serviceID.iam_id
roles = ["Viewer"]
resources {
service = "kms"
Expand All @@ -286,7 +286,7 @@ func testAccCheckIBMIAMServicePolicyDataSourceTimeBasedCustom(name string) strin
}

data "ibm_iam_service_policy" "testacc_ds_service_policy" {
iam_service_id = ibm_iam_service_policy.policy.iam_service_id
iam_id = ibm_iam_service_policy.policy.iam_id
}
`, name)
}
Expand All @@ -301,7 +301,7 @@ func testAccCheckIBMIAMServicePolicyDataSourceServiceGroupID(name string) string
}

resource "ibm_iam_service_policy" "policy" {
iam_service_id = ibm_iam_service_id.serviceID.id
iam_id = ibm_iam_service_id.serviceID.iam_id
roles = ["Viewer"]
resources {
service_group_id = "IAM"
Expand All @@ -326,7 +326,7 @@ func testAccCheckIBMIAMServicePolicyDataSourceServiceGroupID(name string) string
}

data "ibm_iam_service_policy" "testacc_ds_service_policy" {
iam_service_id = ibm_iam_service_policy.policy.iam_service_id
iam_id = ibm_iam_service_policy.policy.iam_id
}
`, name)
}
58 changes: 5 additions & 53 deletions 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 @@ -8,11 +8,9 @@ import (

"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"

"github.com/IBM/go-sdk-core/v5/core"
"github.com/IBM/platform-services-go-sdk/iamidentityv1"
"github.com/IBM/platform-services-go-sdk/iampolicymanagementv1"
)

Expand All @@ -22,19 +20,10 @@ func DataSourceIBMIAMTrustedProfilePolicy() *schema.Resource {
Read: dataSourceIBMIAMTrustedProfilePolicyRead,

Schema: map[string]*schema.Schema{
"profile_id": {
Type: schema.TypeString,
Optional: true,
ExactlyOneOf: []string{"profile_id", "iam_id"},
Description: "UUID of trusted profile",
ValidateFunc: validate.InvokeDataSourceValidator("ibm_iam_trusted_profile_policy",
"profile_id"),
},
"iam_id": {
Type: schema.TypeString,
Optional: true,
ExactlyOneOf: []string{"profile_id", "iam_id"},
Description: "IAM ID of trusted profile",
Type: schema.TypeString,
Required: true,
Description: "IAM ID of trusted profile",
},
"sort": {
Description: "Sort query for policies",
Expand Down Expand Up @@ -251,40 +240,9 @@ func DataSourceIBMIAMTrustedProfilePolicy() *schema.Resource {
}
}

func DataSourceIBMIAMTrustedProfilePolicyValidator() *validate.ResourceValidator {
validateSchema := make([]validate.ValidateSchema, 0)
validateSchema = append(validateSchema,
validate.ValidateSchema{
Identifier: "profile_id",
ValidateFunctionIdentifier: validate.ValidateCloudData,
Type: validate.TypeString,
CloudDataType: "iam",
CloudDataRange: []string{"service:trusted_profile", "resolved_to:id"},
Required: true})

iBMIAMTrustedProfilePolicyValidator := validate.ResourceValidator{ResourceName: "ibm_iam_trusted_profile_policy", Schema: validateSchema}
return &iBMIAMTrustedProfilePolicyValidator
}

func dataSourceIBMIAMTrustedProfilePolicyRead(d *schema.ResourceData, meta interface{}) error {

var iamID string
if v, ok := d.GetOk("profile_id"); ok && v != nil {

profileUUID := v.(string)
iamClient, err := meta.(conns.ClientSession).IAMIdentityV1API()
if err != nil {
return err
}
getprofileOptions := iamidentityv1.GetProfileOptions{
ProfileID: &profileUUID,
}
profile, resp, err := iamClient.GetProfile(&getprofileOptions)
if err != nil {
return fmt.Errorf("[ERROR] Error getting profile ID %s %s", err, resp)
}
iamID = *profile.IamID
}
if v, ok := d.GetOk("iam_id"); ok && v != nil {
iamID = v.(string)
}
Expand Down Expand Up @@ -332,10 +290,7 @@ func dataSourceIBMIAMTrustedProfilePolicyRead(d *schema.ResourceData, meta inter
"resources": resources,
"resource_tags": flex.FlattenV2PolicyResourceTags(*policy.Resource),
}
if v, ok := d.GetOk("profile_id"); ok && v != nil {
profileUUID := v.(string)
p["id"] = fmt.Sprintf("%s/%s", profileUUID, *policy.ID)
} else if v, ok := d.GetOk("iam_id"); ok && v != nil {
if v, ok := d.GetOk("iam_id"); ok && v != nil {
iamID := v.(string)
p["id"] = fmt.Sprintf("%s/%s", iamID, *policy.ID)
}
Expand All @@ -358,10 +313,7 @@ func dataSourceIBMIAMTrustedProfilePolicyRead(d *schema.ResourceData, meta inter
profilePolicies = append(profilePolicies, p)
}

if v, ok := d.GetOk("profile_id"); ok && v != nil {
profileUUID := v.(string)
d.SetId(profileUUID)
} else if v, ok := d.GetOk("iam_id"); ok && v != nil {
if v, ok := d.GetOk("iam_id"); ok && v != nil {
iamID := v.(string)
d.SetId(iamID)
}
Expand Down
Loading
Loading