Merge branch 'master' into vol-job

Author: uibm

.github/workflows/go.yml

@@ -20,7 +20,7 @@ jobs:
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/[email protected].0
+      uses: actions/[email protected].1
 
     - name: Get dependencies
       run: |

.github/workflows/issues.yml

@@ -6,7 +6,7 @@ jobs:
   labelIssues:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/[email protected].0
+    - uses: actions/[email protected].1
     - name: Apply Issue Labels
       uses: github/[email protected]
       with:

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/[email protected].0
+        uses: actions/[email protected].1
       -
         name: Unshallow
         run: git fetch --prune --unshallow

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/IBM/configuration-aggregator-go-sdk v0.0.2
 	github.com/IBM/container-registry-go-sdk v1.2.0
 	github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.6
-	github.com/IBM/event-notifications-go-admin-sdk v0.20.0
+	github.com/IBM/event-notifications-go-admin-sdk v0.21.0
 	github.com/IBM/eventstreams-go-sdk v1.4.0
 	github.com/IBM/go-sdk-core/v5 v5.21.0
 	github.com/IBM/ibm-backup-recovery-sdk-go v1.0.5
@@ -38,7 +38,7 @@ require (
 	github.com/IBM/secrets-manager-go-sdk/v2 v2.0.15
 	github.com/IBM/vmware-go-sdk v0.1.5
 	github.com/IBM/vpc-beta-go-sdk v0.8.0
-	github.com/IBM/vpc-go-sdk v0.74.1
+	github.com/IBM/vpc-go-sdk v0.75.0
 	github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5
 	github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
 	github.com/akamai/AkamaiOPEN-edgegrid-golang/v5 v5.0.0

go.sum

@@ -115,8 +115,8 @@ github.com/IBM/container-registry-go-sdk v1.2.0 h1:DX08GSKFvgCcUne9rWwb9+UttevV4
 github.com/IBM/container-registry-go-sdk v1.2.0/go.mod h1:fE1iNfehccXBx1wmX/RUWksDteWOOOXJFtHWYlT4zKk=
 github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.6 h1:CdJWGVzcHngf6un5N2C4KDgIzqViA2Md6pSeZNZzsLQ=
 github.com/IBM/continuous-delivery-go-sdk/v2 v2.0.6/go.mod h1:Iibf+4gRasEZHakDgnMm7TOX87xex0L+DfghUclcmcg=
-github.com/IBM/event-notifications-go-admin-sdk v0.20.0 h1:IuIWVLQuNfIfuw/ZRqu06x85zIKq6HiMzT4vlgPeJTw=
-github.com/IBM/event-notifications-go-admin-sdk v0.20.0/go.mod h1:9fG6k1gYRqiChZvmn1iRIjaKCXuDBCOlPH6xPJN+mMU=
+github.com/IBM/event-notifications-go-admin-sdk v0.21.0 h1:WqKRm0mQoDKb6VlFrF2Ksz3SEizM1MGxx/HSF3In1ns=
+github.com/IBM/event-notifications-go-admin-sdk v0.21.0/go.mod h1:9fG6k1gYRqiChZvmn1iRIjaKCXuDBCOlPH6xPJN+mMU=
 github.com/IBM/eventstreams-go-sdk v1.4.0 h1:yS/Ns29sBOe8W2tynQmz9HTKqQZ0ckse4Py5Oy/F2rM=
 github.com/IBM/eventstreams-go-sdk v1.4.0/go.mod h1:2tuAxaYLctfqfr5jvyqSrxxEQGMwYPm3yJGWSj85YVQ=
 github.com/IBM/go-sdk-core/v5 v5.0.0/go.mod h1:vyNdbFujJtdTj9HbihtvKwwS3k/GKSKpOx9ZIQ6MWDY=
@@ -170,6 +170,8 @@ github.com/IBM/vpc-beta-go-sdk v0.8.0 h1:cEPpv4iw3Ba5W2d0AWg3TIbKeJ8y1nPuUuibR5J
 github.com/IBM/vpc-beta-go-sdk v0.8.0/go.mod h1:hORgIyTFRzXrZIK9IohaWmCRBBlYiDRagsufi7M6akE=
 github.com/IBM/vpc-go-sdk v0.74.1 h1:qkWwdlILx3ZVNWht96CdlPKwhKL/y3ItN6XmwJ1rShM=
 github.com/IBM/vpc-go-sdk v0.74.1/go.mod h1:8lX6TpeYBbx1Vd4KTgM3PPQ4y3auGOPuD6qq3UBDdug=
+github.com/IBM/vpc-go-sdk v0.75.0 h1:8s11vR30n0eY9ptf6Osh9Bw13okhMVasb/KX9M52LEg=
+github.com/IBM/vpc-go-sdk v0.75.0/go.mod h1:8lX6TpeYBbx1Vd4KTgM3PPQ4y3auGOPuD6qq3UBDdug=
 github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0=
 github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56/go.mod h1:Zb3OT4l0mf7P/GOs2w2Ilj5sdm5Whoq3pa24dAEBHFc=
 github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=

ibm/acctest/acctest.go

@@ -237,6 +237,7 @@ var (
 	Pi_image_bucket_region            string
 	Pi_image_bucket_secret_key        string
 	Pi_image_id                       string
+	Pi_instance_id                    string
 	Pi_instance_name                  string
 	Pi_key_name                       string
 	Pi_network_address_group_id       string
@@ -1324,10 +1325,16 @@ func init() {
 		fmt.Println("[INFO] Set the environment variable PI_SNAPSHOT_ID for testing ibm_pi_instance_snapshot data source else it is set to default value '1ea33118-4c43-4356-bfce-904d0658de82'")
 	}
 
-	Pi_instance_name = os.Getenv("PI_PVM_INSTANCE_NAME")
+	Pi_instance_id = os.Getenv("PI_INSTANCE_ID")
+	if Pi_instance_id == "" {
+		Pi_instance_id = "terraform-test-power"
+		fmt.Println("[INFO] Set the environment variable PI_INSTANCE_ID for testing ibm_pi_instance resource else it is set to default value 'terraform-test-power'")
+	}
+
+	Pi_instance_name = os.Getenv("PI_INSTANCE_NAME")
 	if Pi_instance_name == "" {
 		Pi_instance_name = "terraform-test-power"
-		fmt.Println("[INFO] Set the environment variable PI_PVM_INSTANCE_ID for testing Pi_instance_name resource else it is set to default value 'terraform-test-power'")
+		fmt.Println("[INFO] Set the environment variable PI_INSTANCE_NAME for testing ibm_pi_instance resource else it is set to default value 'terraform-test-power'")
 	}
 
 	Pi_dhcp_id = os.Getenv("PI_DHCP_ID")

ibm/conns/config.go

@@ -2297,7 +2297,7 @@ func (c *Config) ClientSession() (interface{}, error) {
 	}
 	globalSearchAPIV2, err := searchv2.NewGlobalSearchV2(globalSearchV2Options)
 	if err != nil {
-		session.globalTaggingConfigErrV1 = fmt.Errorf("[ERROR] Error occured while configuring Global Search: %q", err)
+		session.globalSearchConfigErrV2 = fmt.Errorf("[ERROR] Error occured while configuring Global Search: %q", err)
 	}
 	if globalSearchAPIV2 != nil && globalSearchAPIV2.Service != nil {
 		session.globalSearchServiceAPIV2 = *globalSearchAPIV2

ibm/provider/provider.go

@@ -650,6 +650,9 @@ func Provider() *schema.Provider {
 
 			"ibm_is_vpn_gateway_connection_local_cidrs": vpc.DataSourceIBMIsVPNGatewayConnectionLocalCidrs(),
 			"ibm_is_vpn_gateway_connection_peer_cidrs":  vpc.DataSourceIBMIsVPNGatewayConnectionPeerCidrs(),
+			"ibm_is_vpn_gateway_advertised_cidrs":       vpc.DataSourceIBMIsVPNGatewayAdvertisedCidrs(),
+			"ibm_is_vpn_gateway_service_connection":     vpc.DataSourceIBMIsVPNGatewayServiceConnection(),
+			"ibm_is_vpn_gateway_service_connections":    vpc.DataSourceIBMIsVPNGatewayServiceConnections(),
 
 			"ibm_is_vpc_default_routing_table":       vpc.DataSourceIBMISVPCDefaultRoutingTable(),
 			"ibm_is_vpc_routing_table":               vpc.DataSourceIBMIsVPCRoutingTable(),
@@ -706,6 +709,7 @@ func Provider() *schema.Provider {
 
 			"ibm_resource_quota":    resourcecontroller.DataSourceIBMResourceQuota(),
 			"ibm_resource_group":    resourcemanager.DataSourceIBMResourceGroup(),
+			"ibm_resource_groups":   resourcemanager.DataSourceIBMResourceGroups(),
 			"ibm_resource_instance": resourcecontroller.DataSourceIBMResourceInstance(),
 			"ibm_resource_key":      resourcecontroller.DataSourceIBMResourceKey(),
 			"ibm_security_group":    classicinfrastructure.DataSourceIBMSecurityGroup(),
@@ -1408,6 +1412,7 @@ func Provider() *schema.Provider {
 			"ibm_is_volume":                                vpc.ResourceIBMISVolume(),
 			"ibm_is_vpn_gateway":                           vpc.ResourceIBMISVPNGateway(),
 			"ibm_is_vpn_gateway_connection":                vpc.ResourceIBMISVPNGatewayConnection(),
+			"ibm_is_vpn_gateway_advertised_cidr":           vpc.ResourceIBMISVPNGatewayAdvertisedCidr(),
 			"ibm_is_vpc":                                   vpc.ResourceIBMISVPC(),
 			"ibm_is_vpc_address_prefix":                    vpc.ResourceIBMISVpcAddressPrefix(),
 			"ibm_is_vpc_dns_resolution_binding":            vpc.ResourceIBMIsVPCDnsResolutionBinding(),
@@ -2324,6 +2329,7 @@ func Validator() validate.ValidatorDict {
 				"ibm_resource_instance":             resourcecontroller.DataSourceIBMResourceInstanceValidator(),
 				"ibm_resource_key":                  resourcecontroller.DataSourceIBMResourceKeyValidator(),
 				"ibm_resource_group":                resourcemanager.DataSourceIBMResourceGroupValidator(),
+				"ibm_resource_groups":               resourcemanager.DataSourceIBMResourceGroupsValidator(),
 
 				// bare_metal_server
 				"ibm_is_bare_metal_server": vpc.DataSourceIBMIsBareMetalServerValidator(),

ibm/service/cis/data_source_ibm_cis_rulesets.go

@@ -518,39 +518,42 @@ func flattenCISRulesets(rulesetObj rulesetsv1.RulesetDetails) interface{} {
 	rulesetOutput[CISRulesetsVersion] = *rulesetObj.Version
 	rulesetOutput[CISRulesetsId] = *&rulesetObj.ID
 
-	ruleDetailsList := make([]map[string]interface{}, 0)
-	for _, ruleDetailsObj := range rulesetObj.Rules {
-		ruleDetails := map[string]interface{}{}
-		ruleDetails[CISRulesetsRuleId] = ruleDetailsObj.ID
-		ruleDetails[CISRulesetsRuleVersion] = ruleDetailsObj.Version
-		ruleDetails[CISRulesetsRuleAction] = ruleDetailsObj.Action
-		ruleDetails[CISRulesetsRuleExpression] = ruleDetailsObj.Expression
-		ruleDetails[CISRulesetsRuleRef] = ruleDetailsObj.Ref
-		ruleDetails[CISRulesetsRuleLastUpdatedAt] = ruleDetailsObj.LastUpdated
-		ruleDetails[CISRulesetsRuleActionCategories] = ruleDetailsObj.Categories
-		ruleDetails[CISRulesetsRuleActionEnabled] = ruleDetailsObj.Enabled
-		ruleDetails[CISRulesetsRuleActionDescription] = ruleDetailsObj.Description
-
-		// Not Applicable for now
-		//ruleDetails[CISRulesetsRuleLogging] = ruleDetailsObj.Logging
-
-		flattenedActionParameter := flattenCISRulesetsRuleActionParameters(ruleDetailsObj.ActionParameters)
-
-		if len(flattenedActionParameter) != 0 {
-			ruleDetails[CISRulesetsRuleActionParameters] = []map[string]interface{}{flattenedActionParameter}
-		}
+	if rulesetObj.Rules != nil {
+		ruleDetailsList := make([]map[string]interface{}, 0)
+		for _, ruleDetailsObj := range rulesetObj.Rules {
+			ruleDetails := map[string]interface{}{}
+			ruleDetails[CISRulesetsRuleId] = ruleDetailsObj.ID
+			ruleDetails[CISRulesetsRuleVersion] = ruleDetailsObj.Version
+			ruleDetails[CISRulesetsRuleAction] = ruleDetailsObj.Action
+			ruleDetails[CISRulesetsRuleExpression] = ruleDetailsObj.Expression
+			ruleDetails[CISRulesetsRuleRef] = ruleDetailsObj.Ref
+			ruleDetails[CISRulesetsRuleLastUpdatedAt] = ruleDetailsObj.LastUpdated
+			ruleDetails[CISRulesetsRuleActionCategories] = ruleDetailsObj.Categories
+			ruleDetails[CISRulesetsRuleActionEnabled] = ruleDetailsObj.Enabled
+			ruleDetails[CISRulesetsRuleActionDescription] = ruleDetailsObj.Description
+
+			// Not Applicable for now
+			//ruleDetails[CISRulesetsRuleLogging] = ruleDetailsObj.Logging
+
+			if ruleDetailsObj.ActionParameters != nil {
+				flattenedActionParameter := flattenCISRulesetsRuleActionParameters(ruleDetailsObj.ActionParameters)
+				if len(flattenedActionParameter) != 0 {
+					ruleDetails[CISRulesetsRuleActionParameters] = []map[string]interface{}{flattenedActionParameter}
+				}
+			}
 
-		ruleDetailsList = append(ruleDetailsList, ruleDetails)
+			ruleDetailsList = append(ruleDetailsList, ruleDetails)
+		}
+		rulesetOutput[CISRulesetsRules] = ruleDetailsList
 	}
 
-	rulesetOutput[CISRulesetsRules] = ruleDetailsList
-
 	finalrulesetObj = append(finalrulesetObj, rulesetOutput)
 
 	return finalrulesetObj
 }
 
 func flattenCISRulesetsRuleActionParameters(rulesetsRuleActionParameterObj *rulesetsv1.ActionParameters) map[string]interface{} {
+
 	actionParametersOutput := map[string]interface{}{}
 	resultOutput := map[string]interface{}{}
 
@@ -584,18 +587,19 @@ func flattenCISRulesetsRuleActionParameters(rulesetsRuleActionParameterObj *rule
 		resultOutput[CISRulesetOverrides] = []map[string]interface{}{flattenCISRulesetsRuleActionParameterOverrides}
 	}
 
-	if rulesToSkip := rulesetsRuleActionParameterObj.Rules; rulesToSkip != nil && len(rulesToSkip) > 0 {
-		flattenedRulesToSkip := make([]map[string]interface{}, 0, len(rulesToSkip))
-
-		for rulesetID, ruleIDs := range rulesToSkip {
-			entry := map[string]interface{}{
-				"ruleset_id": rulesetID,
-				"rule_ids":   ruleIDs,
+	if _, ok := actionParametersOutput["rules"]; ok {
+		rulesToSkip := rulesetsRuleActionParameterObj.Rules
+		if len(rulesToSkip) > 0 {
+			flattenedRulesToSkip := make([]map[string]interface{}, 0, len(rulesToSkip))
+			for rulesetID, ruleIDs := range rulesToSkip {
+				entry := map[string]interface{}{
+					"ruleset_id": rulesetID,
+					"rule_ids":   ruleIDs,
+				}
+				flattenedRulesToSkip = append(flattenedRulesToSkip, entry)
 			}
-			flattenedRulesToSkip = append(flattenedRulesToSkip, entry)
+			resultOutput[CISRulesToSkip] = flattenedRulesToSkip
 		}
-
-		resultOutput[CISRulesToSkip] = flattenedRulesToSkip
 	}
 
 	return resultOutput

ibm/service/eventnotification/resource_ibm_en_smtp_user.go

@@ -42,9 +42,16 @@ func ResourceIBMEnSMTPUser() *schema.Resource {
 			},
 			"smtp_config_id": &schema.Schema{
 				Type:        schema.TypeString,
-				Optional:    true,
+				ForceNew:    true,
+				Required:    true,
 				Description: "SMTP confg Id.",
 			},
+			"username_to_clone": &schema.Schema{
+				Type:        schema.TypeString,
+				ForceNew:    true,
+				Optional:    true,
+				Description: "Name of the user to clone.",
+			},
 			"domain": &schema.Schema{
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -122,6 +129,9 @@ func resourceIBMEnSMTPUserCreate(context context.Context, d *schema.ResourceData
 	if _, ok := d.GetOk("description"); ok {
 		createSMTPUserOptions.SetDescription(d.Get("description").(string))
 	}
+	if _, ok := d.GetOk("username_to_clone"); ok {
+		createSMTPUserOptions.SetUsernameToClone(d.Get("username_to_clone").(string))
+	}
 
 	smtpUserResponse, _, err := eventNotificationsClient.CreateSMTPUserWithContext(context, createSMTPUserOptions)
 	if err != nil {