Merge pull request #33 from Traceableai/user-att-bug

ENG-46219 fix user att bug

docs/resources/user_attribution_rule_basic_auth.md

@@ -30,6 +30,7 @@ resource "traceable_user_attribution_rule_basic_auth" "test1" {
 
 ### Optional
 
+- `disabled` (Boolean) Flag to enable or disable the rule
 - `environment` (String) environment
 - `url_regex` (String) url regex
 

docs/resources/user_attribution_rule_custom_json.md

@@ -33,6 +33,7 @@ resource "traceable_user_attribution_rule_custom_json" "test5" {
 
 ### Optional
 
+- `disabled` (Boolean) Flag to enable or disable the rule
 - `environment` (String) environement of rule
 - `url_regex` (String) url regex
 - `user_id_json` (String) user id json

docs/resources/user_attribution_rule_custom_token.md

@@ -35,6 +35,7 @@ resource "traceable_user_attribution_rule_custom_token" "test6" {
 
 ### Optional
 
+- `disabled` (Boolean) Flag to enable or disable the rule
 - `environment` (String) environement of rule
 - `url_regex` (String) url regex
 

docs/resources/user_attribution_rule_jwt_authentication.md

@@ -37,6 +37,7 @@ resource "traceable_user_attribution_rule_jwt_authentication" "test3" {
 ### Optional
 
 - `auth_type` (String) auth type of the user attribution rule
+- `disabled` (Boolean) Flag to enable or disable the rule
 - `environment` (String) environment
 - `token_capture_group` (String) token capture group
 - `url_regex` (String) url regex

docs/resources/user_attribution_rule_req_header.md

@@ -36,6 +36,7 @@ resource "traceable_user_attribution_rule_req_header" "test2" {
 ### Optional
 
 - `auth_type` (String) auth type of the user attribution rule
+- `disabled` (Boolean) Flag to enable or disable the rule
 - `environment` (String) environment
 - `role_location_regex_capture_group` (String) user role location regex capture group
 - `url_regex` (String) url regex

docs/resources/user_attribution_rule_response_body.md

@@ -34,6 +34,7 @@ resource "traceable_user_attribution_rule_response_body" "test4" {
 ### Optional
 
 - `auth_type` (String) auth type of the user attribution rule
+- `disabled` (Boolean) Flag to enable or disable the rule
 - `user_role_location_json_path` (String) user role location json path
 
 ### Read-Only

provider/provider.go

@@ -32,7 +32,7 @@ func Provider() *schema.Provider {
 			"traceable_notification_rule_threat_actor_status": resourceNotificationRuleThreatActorStatusChange(),
 			"traceable_notification_rule_actor_severity_change": resourceNotificationRuleActorSeverityChange(),
 			"traceable_api_naming_rule":                          resourceApiNamingRule(),
-			"traceable_api_exclusion_rule":                       resourceApiExclusionRule(),
+			// "traceable_api_exclusion_rule":                       resourceApiExclusionRule(),
 			"traceable_label_creation_rule":                      resourceLabelCreationRule(),
 			"traceable_agent_token":                              resourceAgentToken(),
 

provider/resource_user_attribution_basic_auth.go

@@ -35,20 +35,33 @@ func resourceUserAttributionBasicAuthRule() *schema.Resource {
 				Description: "url regex",
 				Optional:    true,
 			},
+			"disabled": {
+				Type:        schema.TypeBool,
+				Description: "Flag to enable or disable the rule",
+				Optional:    true,
+				Default:     false,
+			},
+			"category": {
+				Type:        schema.TypeString,
+				Description: "Type of user attribution rule",
+				Optional:    true,
+				Default:     "BASIC_AUTH",
+			},
 		},
 	}
 }
 
 func resourceUserAttributionRuleBasicAuthCreate(d *schema.ResourceData, meta interface{}) error {
 	name := d.Get("name").(string)
+	category := d.Get("category").(string)
 
 	scopeType:=d.Get("scope_type").(string)
 
 	var query string
 	if scopeType == "SYSTEM_WIDE" {
 		query = fmt.Sprintf(`mutation {
 			createUserAttributionRule(
-			  input: {name: "%s", type: BASIC_AUTH, scopeType: %s}
+			  input: {name: "%s", type: %s, scopeType: %s}
 			) {
 			  results {
 				id
@@ -58,7 +71,7 @@ func resourceUserAttributionRuleBasicAuthCreate(d *schema.ResourceData, meta int
 			  }
 			  total
 			}
-		  }`,name,scopeType)
+		  }`,name,category,scopeType)
 	} else if scopeType== "CUSTOM" {
 		environment:=d.Get("environment").(string)
 		url_regex:=d.Get("url_regex").(string)
@@ -73,7 +86,7 @@ func resourceUserAttributionRuleBasicAuthCreate(d *schema.ResourceData, meta int
 		}
 		query = fmt.Sprintf(`mutation {
 			createUserAttributionRule(
-			  input: {name: "%s", type: BASIC_AUTH, scopeType: CUSTOM, %s}
+			  input: {name: "%s", type: %s, scopeType: CUSTOM, %s}
 			) {
 			  results {
 				id
@@ -84,7 +97,7 @@ func resourceUserAttributionRuleBasicAuthCreate(d *schema.ResourceData, meta int
 			  }
 			  total
 			}
-		  }`,name,scopedQuery)
+		  }`,name,category,scopedQuery)
 	}else{
 		return fmt.Errorf("Expected values are CUSTOM or SYSTEM_WIDE for user attribution scope type")
 	}
@@ -126,6 +139,10 @@ func resourceUserAttributionRuleBasicAuthRead(d *schema.ResourceData, meta inter
 	}
 	log.Printf("fetching from read %s",ruleDetails)
 	name:=ruleDetails["name"].(string)
+	category:=ruleDetails["type"].(string)
+	disabled:=ruleDetails["disabled"].(bool)
+	d.Set("disabled",disabled)
+	d.Set("category",category)
 	scopeType:=ruleDetails["scopeType"]
 	d.Set("name",name)
 	if scopeType=="SYSTEM_WIDE"{
@@ -148,7 +165,9 @@ func resourceUserAttributionRuleBasicAuthRead(d *schema.ResourceData, meta inter
 func resourceUserAttributionRuleBasicAuthUpdate(d *schema.ResourceData, meta interface{}) error {
 	id:=d.Id()
 	name := d.Get("name").(string)
+	disabled := d.Get("disabled").(bool)
 	scopeType:=d.Get("scope_type").(string)
+	category:=d.Get("category").(string)
 	readQuery:="{userAttributionRules{results{id scopeType rank name type disabled customScope{environmentScopes{environmentName}urlScopes{urlMatchRegex}}}}}"
 	readQueryResStr, err := executeQuery(readQuery, meta)
 	if err != nil {
@@ -167,14 +186,14 @@ func resourceUserAttributionRuleBasicAuthUpdate(d *schema.ResourceData, meta int
 	if scopeType == "SYSTEM_WIDE" {
 		query = fmt.Sprintf(`mutation {
 			updateUserAttributionRule(
-			  rule: {name: "%s", type: BASIC_AUTH,id:"%s",rank:%d, scopeType: %s}
+			  rule: {name: "%s", type: %s,id:"%s",rank:%d,disabled: %t, scopeType: %s}
 			) {
 				id
 				scopeType
 				rank
 				name
 			}
-		  }`,name,id,rank,scopeType)
+		  }`,name,category,id,rank,disabled,scopeType)
 	} else if scopeType== "CUSTOM" {
 		environment:=d.Get("environment").(string)
 		url_regex:=d.Get("url_regex").(string)
@@ -189,15 +208,15 @@ func resourceUserAttributionRuleBasicAuthUpdate(d *schema.ResourceData, meta int
 		}
 		query = fmt.Sprintf(`mutation {
 			updateUserAttributionRule(
-			  rule: {name: "%s", type: BASIC_AUTH,id:"%s",rank:%d, scopeType: CUSTOM, %s}
+			  rule: {name: "%s", type: %s,id:"%s",rank:%d,disabled: %t scopeType: CUSTOM, %s}
 			) {
 				id
 				scopeType
 				rank
 				name
 				type
 			}
-		  }`,name,id,rank,scopedQuery)
+		  }`,name,category,id,rank,disabled,scopedQuery)
 	}else{
 		return fmt.Errorf("Expected values are CUSTOM or SYSTEM_WIDE for user attribution scope type")
 	}

provider/resource_user_attribution_custom_json.go

@@ -50,12 +50,25 @@ func resourceUserAttributionCustomJsonRule() *schema.Resource {
 				Description: "user role json",
 				Optional:    true,
 			},
+			"disabled": {
+				Type:        schema.TypeBool,
+				Description: "Flag to enable or disable the rule",
+				Optional:    true,
+				Default:     false,
+			},
+			"category": {
+				Type:        schema.TypeString,
+				Description: "Type of user attribution rule",
+				Optional:    true,
+				Default:     "CUSTOM_JSON",
+			},
 		},
 	}
 }
 
 func resourceUserAttributionRuleCustomJsonCreate(d *schema.ResourceData, meta interface{}) error {
 	name := d.Get("name").(string)
+	category := d.Get("category").(string)
 	scope_type := d.Get("scope_type").(string)
 	environment := d.Get("environment").(string)
 	url_regex:=d.Get("url_regex").(string)
@@ -95,7 +108,7 @@ func resourceUserAttributionRuleCustomJsonCreate(d *schema.ResourceData, meta in
 		createUserAttributionRule(
 		  input: {
 		  name: "%s", 
-		  type: CUSTOM_JSON, 
+		  type: %s, 
 		  scopeType: %s, 
 		  %s
 		  %s
@@ -110,7 +123,7 @@ func resourceUserAttributionRuleCustomJsonCreate(d *schema.ResourceData, meta in
 		  }
 		  total
 		}
-	  }`,name,scope_type,customJsonString,customScopeString)
+	  }`,name,category,scope_type,customJsonString,customScopeString)
 
 	var response map[string]interface{}
 	responseStr, err := executeQuery(query, meta)
@@ -151,8 +164,11 @@ func resourceUserAttributionRuleCustomJsonRead(d *schema.ResourceData, meta inte
 	log.Printf("fetching from read %s",ruleDetails)
 	name:=ruleDetails["name"].(string)
 	scopeType:=ruleDetails["scopeType"].(string)
+	category:=ruleDetails["type"].(string)
+	d.Set("category",category)
 	d.Set("name",name)
-
+	disabled:=ruleDetails["disabled"].(bool)
+	d.Set("disabled",disabled)
 	if scopeType=="SYSTEM_WIDE"{
 		d.Set("scope_type", "SYSTEM_WIDE")
 		// d.Set("url_regex",nil)
@@ -170,17 +186,19 @@ func resourceUserAttributionRuleCustomJsonRead(d *schema.ResourceData, meta inte
 			// d.Set("url_regex",nil)
 		}
 	}
+	customJsonDetails:=ruleDetails["customJson"]
+	if customJsonDetails!=nil{
 
-	customJsonDetails:=ruleDetails["customJson"].(map[string]interface{})
-
-	authTypeJson,err:=json.Marshal(customJsonDetails["authTypeJson"])
-	userIdJson,err:=json.Marshal(customJsonDetails["userIdJson"])
-	userRoleJson,err:=json.Marshal(customJsonDetails["userRoleJson"])
+		authTypeJson,_:=json.Marshal(customJsonDetails.(map[string]interface{})["authTypeJson"])
+		userIdJson,_:=json.Marshal(customJsonDetails.(map[string]interface{})["userIdJson"])
+		userRoleJson,_:=json.Marshal(customJsonDetails.(map[string]interface{})["userRoleJson"])
+
+		d.Set("auth_type_json",authTypeJson)
+		d.Set("user_id_json",userIdJson)
+		d.Set("user_role_json",userRoleJson)
 
-	d.Set("auth_type_json",authTypeJson)
-	d.Set("user_id_json",userIdJson)
-	d.Set("user_role_json",userRoleJson)
-
+		return nil
+	}
 	return nil
 }
 
@@ -200,8 +218,9 @@ func resourceUserAttributionRuleCustomJsonUpdate(d *schema.ResourceData, meta in
 		return nil
 	}
 	rank:=int(readRuleDetails["rank"].(float64))
-
+	category:=d.Get("category").(string)
 	name := d.Get("name").(string)
+	disabled := d.Get("disabled").(bool)
 	scope_type := d.Get("scope_type").(string)
 	environment := d.Get("environment").(string)
 	url_regex:=d.Get("url_regex").(string)
@@ -242,7 +261,8 @@ func resourceUserAttributionRuleCustomJsonUpdate(d *schema.ResourceData, meta in
 			id:"%s",
 			rank:%d
 			name: "%s", 
-			type: CUSTOM_JSON, 
+			disabled: %t,
+			type: %s, 
 			scopeType: %s, 
 			%s
 			%s
@@ -254,7 +274,7 @@ func resourceUserAttributionRuleCustomJsonUpdate(d *schema.ResourceData, meta in
 			name
 			type
 		}
-	  }`,id,rank,name,scope_type,customJsonString,customScopeString)
+	  }`,id,rank,name,disabled,category,scope_type,customJsonString,customScopeString)
 
 
 	var response map[string]interface{}