Remove session_note_label

keycloak · Sep 11, 2020 · d83e29c · d83e29c
1 parent 67306de
commit d83e29c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 28 deletions.
diff --git a/docs-old/resources/keycloak_openid_user_session_note_protocol_mapper.md b/docs-old/resources/keycloak_openid_user_session_note_protocol_mapper.md
@@ -32,7 +32,6 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	claim_name         = "foo"
 	claim_value_type   = "String"
 	session_note       = "bar"
-	session_note_label = "bar"
     add_to_id_token     = true
     add_to_access_token = false
 }
@@ -56,7 +55,6 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	claim_name         = "foo"
 	claim_value_type   = "String"
 	session_note       = "bar"
-	session_note_label = "bar"
     add_to_id_token     = true
     add_to_access_token = false
 }
@@ -73,7 +71,6 @@ The following arguments are supported:
 - `claim_name` - (Required) The name of the claim to insert into a token.
 - `claim_value_type` - (Optional) The claim type used when serializing JSON tokens. Can be one of `String`, `JSON`, `long`, `int`, or `boolean`. Defaults to `String`.
 - `session_note` - (Optional) String value being the name of stored user session note within the UserSession.note map.
-- `session_note_label` - (Optional) String value being the name of stored user session note within the UserSessionModel.note map.
 - `add_to_id_token` - (Optional) Indicates if the property should be added as a claim to the id token. Defaults to `true`.
 - `add_to_access_token` - (Optional) Indicates if the property should be added as a claim to the access token. Defaults to `true`.
 

diff --git a/keycloak/openid_user_session_note_protocol_mapper.go b/keycloak/openid_user_session_note_protocol_mapper.go
@@ -18,7 +18,6 @@ type OpenIdUserSessionNoteProtocolMapper struct {
 	ClaimName            string
 	ClaimValueType       string
 	UserSessionNote      string
-	UserSessionNoteLabel string
 }
 
 func (mapper *OpenIdUserSessionNoteProtocolMapper) convertToGenericProtocolMapper() *protocolMapper {
@@ -33,7 +32,6 @@ func (mapper *OpenIdUserSessionNoteProtocolMapper) convertToGenericProtocolMappe
 			claimNameField:                 mapper.ClaimName,
 			claimValueTypeField:            mapper.ClaimValueType,
 			userSessionNoteField:           mapper.UserSessionNote,
-			userSessionModelNoteLabelField: mapper.UserSessionNoteLabel,
 		},
 	}
 }
@@ -62,7 +60,6 @@ func (protocolMapper *protocolMapper) convertToOpenIdUserSessionNoteProtocolMapp
 		ClaimName:            protocolMapper.Config[claimNameField],
 		ClaimValueType:       protocolMapper.Config[claimValueTypeField],
 		UserSessionNote:      protocolMapper.Config[userSessionNoteField],
-		UserSessionNoteLabel: protocolMapper.Config[userSessionModelNoteLabelField],
 	}, nil
 }
 

diff --git a/keycloak/protocol_mapper.go b/keycloak/protocol_mapper.go
@@ -31,7 +31,6 @@ var (
 	userClientRoleMappingClientIdField   = "usermodel.clientRoleMapping.clientId"
 	userClientRoleMappingRolePrefixField = "usermodel.clientRoleMapping.rolePrefix"
 	userSessionNoteField                 = "user.session.note"
-	userSessionModelNoteLabelField       = "userSession.modelNote.label"
 	aggregateAttributeValuesField        = "aggregate.attrs"
 )
 

diff --git a/provider/resource_keycloak_openid_user_session_note_protocol_mapper.go b/provider/resource_keycloak_openid_user_session_note_protocol_mapper.go
@@ -73,11 +73,6 @@ func resourceKeycloakOpenIdUserSessionNoteProtocolMapper() *schema.Resource {
 				Optional:    true,
 				Description: "String value being the name of stored user session note within the UserSessionModel.note map.",
 			},
-			"session_note_label": {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Description: "String value being the name of stored user session note within the UserSessionModel.note map.",
-			},
 		},
 	}
 }
@@ -95,7 +90,6 @@ func mapFromDataToOpenIdUserSessionNoteProtocolMapper(data *schema.ResourceData)
 		ClaimName:            data.Get("claim_name").(string),
 		ClaimValueType:       data.Get("claim_value_type").(string),
 		UserSessionNote:      data.Get("session_note").(string),
-		UserSessionNoteLabel: data.Get("session_note_label").(string),
 	}
 }
 
@@ -115,7 +109,6 @@ func mapFromOpenIdUserSessionNoteMapperToData(mapper *keycloak.OpenIdUserSession
 	data.Set("claim_name", mapper.ClaimName)
 	data.Set("claim_value_type", mapper.ClaimValueType)
 	data.Set("session_note", mapper.UserSessionNote)
-	data.Set("session_note_label", mapper.UserSessionNoteLabel)
 }
 
 func resourceKeycloakOpenIdUserSessionNoteProtocolMapperCreate(data *schema.ResourceData, meta interface{}) error {

diff --git a/provider/resource_keycloak_openid_user_session_note_protocol_mapper_test.go b/provider/resource_keycloak_openid_user_session_note_protocol_mapper_test.go
@@ -115,13 +115,13 @@ func TestAccKeycloakOpenIdUserSessionNoteProtocolMapper_updateClaim(t *testing.T
 	})
 }
 
-func TestAccKeycloakOpenIdUserSessionNoteProtocolMapper_updateLabel(t *testing.T) {
+func TestAccKeycloakOpenIdUserSessionNoteProtocolMapper_updateNote(t *testing.T) {
 	realmName := "terraform-realm-" + acctest.RandString(10)
 	clientId := "terraform-client-" + acctest.RandString(10)
 	mapperName := "terraform-openid-connect-user-session-note-mapper-" + acctest.RandString(5)
 
-	labelName := "session-note-label-" + acctest.RandString(10)
-	updatedLabelName := "session-note-label-update-" + acctest.RandString(10)
+	noteName := "session-note-" + acctest.RandString(10)
+	updatedNoteName := "session-note-update-" + acctest.RandString(10)
 
 	resourceName := "keycloak_openid_user_session_note_protocol_mapper.user_session_note_mapper"
 
@@ -131,11 +131,11 @@ func TestAccKeycloakOpenIdUserSessionNoteProtocolMapper_updateLabel(t *testing.T
 		CheckDestroy:      testAccKeycloakOpenIdUserSessionNoteProtocolMapperDestroy(),
 		Steps: []resource.TestStep{
 			{
-				Config: testKeycloakOpenIdUserSessionNoteProtocolMapper_label(realmName, clientId, mapperName, labelName),
+				Config: testKeycloakOpenIdUserSessionNoteProtocolMapper_note(realmName, clientId, mapperName, noteName),
 				Check:  testKeycloakOpenIdUserSessionNoteProtocolMapperExists(resourceName),
 			},
 			{
-				Config: testKeycloakOpenIdUserSessionNoteProtocolMapper_label(realmName, clientId, mapperName, updatedLabelName),
+				Config: testKeycloakOpenIdUserSessionNoteProtocolMapper_note(realmName, clientId, mapperName, updatedNoteName),
 				Check:  testKeycloakOpenIdUserSessionNoteProtocolMapperExists(resourceName),
 			},
 		},
@@ -348,7 +348,6 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	claim_name         = "foo"
 	claim_value_type   = "String"
 	session_note       = "bar"
-	session_note_label = "bar"
 }`, realmName, clientId, mapperName)
 }
 
@@ -368,7 +367,6 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	claim_name         = "foo"
 	claim_value_type   = "String"
 	session_note       = "bar"
-	session_note_label = "bar"
 }`, realmName, clientScopeId, mapperName)
 }
 
@@ -391,7 +389,7 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 }`, realmName, clientId, mapperName, claimName)
 }
 
-func testKeycloakOpenIdUserSessionNoteProtocolMapper_label(realmName, clientId, mapperName, labelName string) string {
+func testKeycloakOpenIdUserSessionNoteProtocolMapper_note(realmName, clientId, mapperName, noteName string) string {
 	return fmt.Sprintf(`
 resource "keycloak_realm" "realm" {
 	realm = "%s"
@@ -407,9 +405,8 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	client_id          = "${keycloak_openid_client.openid_client.id}"
 	claim_name         = "foo"
 	claim_value_type   = "String"
-	session_note       = "bar"
-	session_note_label = "%s"
-}`, realmName, clientId, mapperName, labelName)
+	session_note       = "%s"
+}`, realmName, clientId, mapperName, noteName)
 }
 
 func testKeycloakOpenIdUserSessionNoteProtocolMapper_import(realmName, clientId, clientScopeId, mapperName string) string {
@@ -429,7 +426,6 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	claim_name         = "foo"
 	claim_value_type   = "String"
 	session_note       = "bar"
-	session_note_label = "bar"
 }
 resource "keycloak_openid_client_scope" "client_scope" {
 	name     = "%s"
@@ -442,7 +438,6 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	claim_name         = "foo"
 	claim_value_type   = "String"
 	session_note       = "bar"
-	session_note_label = "bar"
 }`, realmName, clientId, mapperName, clientScopeId, mapperName)
 }
 
@@ -463,6 +458,5 @@ resource "keycloak_openid_user_session_note_protocol_mapper" "user_session_note_
 	claim_name         = "foo"
 	claim_value_type   = "%s"
 	session_note       = "bar"
-	session_note_label = "bar"
 }`, realmName, mapperName, claimValueType)
 }