fix: support base64 encoded values in json/yaml (#854)

Author: adietish

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/ResourceEditorInlayHintsProvider.kt

@@ -21,6 +21,8 @@ import com.intellij.codeInsight.hints.InlayHintsSink
 import com.intellij.codeInsight.hints.NoSettings
 import com.intellij.codeInsight.hints.SettingsKey
 import com.intellij.json.psi.JsonFile
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
@@ -51,7 +53,7 @@ internal class ResourceEditorInlayHintsProvider : InlayHintsProvider<NoSettings>
 		}
 	}
 
-	override fun getCollectorFor(file: PsiFile, editor: Editor, settings: NoSettings, sink: InlayHintsSink): InlayHintsCollector? {
+	override fun getCollectorFor(file: PsiFile, editor: Editor, settings: NoSettings, sink: InlayHintsSink): InlayHintsCollector {
 		return Collector(editor)
 	}
 
@@ -75,16 +77,21 @@ internal class ResourceEditorInlayHintsProvider : InlayHintsProvider<NoSettings>
 		}
 
 		private fun create(file: YAMLFile, sink: InlayHintsSink, editor: Editor) {
-			file.documents.forEach { document ->
-				val info = KubernetesTypeInfo.extractMeta(document) ?: return
-				val element = document.topLevelValue ?: return
-				Base64Presentations.create(element, info, sink, editor)?.create()
+			return ReadAction.run<Exception> {
+				file.documents.forEach { document ->
+					val info = KubernetesTypeInfo.create(document) ?: return@forEach
+					val element = document.topLevelValue ?: return@forEach
+					Base64Presentations.create(element, info, sink, editor)?.create()
+				}
 			}
 		}
 
 		private fun create(file: JsonFile, sink: InlayHintsSink, editor: Editor) {
-			val info = KubernetesTypeInfo.extractMeta(file) ?: return
-			Base64Presentations.create(file, info, sink, editor)?.create()
+			return ReadAction.run<Exception> {
+				val info = KubernetesTypeInfo.create(file) ?: return@run
+				val element = file.topLevelValue ?: return@run
+				Base64Presentations.create(element, info, sink, editor)?.create()
+			}
 		}
 
 	}

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/editor/inlay/base64/Base64Presentations.kt

@@ -18,13 +18,12 @@ import com.intellij.openapi.command.WriteCommandAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiElement
-import com.redhat.devtools.intellij.common.validation.KubernetesResourceInfo
 import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo
 import com.redhat.devtools.intellij.kubernetes.balloon.StringInputBalloon
 import com.redhat.devtools.intellij.kubernetes.editor.inlay.base64.Base64Presentations.InlayPresentationsFactory
 import com.redhat.devtools.intellij.kubernetes.editor.inlay.base64.Base64Presentations.create
 import com.redhat.devtools.intellij.kubernetes.editor.util.getBinaryData
-import com.redhat.devtools.intellij.kubernetes.editor.util.getData
+import com.redhat.devtools.intellij.kubernetes.editor.util.getDataValue
 import com.redhat.devtools.intellij.kubernetes.editor.util.isKubernetesResource
 import com.redhat.devtools.intellij.kubernetes.model.util.trimWithEllipsis
 import org.jetbrains.concurrency.runAsync
@@ -44,7 +43,7 @@ object Base64Presentations {
 	fun create(element: PsiElement, info: KubernetesTypeInfo, sink: InlayHintsSink, editor: Editor): InlayPresentationsFactory? {
 		return when {
 			isKubernetesResource(SECRET_RESOURCE_KIND, info) -> {
-				val data = getData(element) ?: return null
+				val data = getDataValue(element) ?: return null
 				StringPresentationsFactory(data, sink, editor)
 			}
 

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourceEditorUtils.kt

@@ -18,6 +18,7 @@ import com.intellij.json.psi.JsonValue
 import com.intellij.openapi.application.ReadAction
 import com.intellij.openapi.fileEditor.FileEditor
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.util.text.StringUtil
 import com.intellij.openapi.util.text.Strings
 import com.intellij.openapi.vfs.VirtualFile
 import com.intellij.psi.PsiElement
@@ -87,7 +88,7 @@ fun getKubernetesResourceInfo(file: VirtualFile?, project: Project): KubernetesR
     return try {
         ReadAction.compute<KubernetesResourceInfo, RuntimeException> {
             val psiFile = PsiManager.getInstance(project).findFile(file) ?: return@compute null
-            KubernetesResourceInfo.extractMeta(psiFile)
+            KubernetesResourceInfo.create(psiFile)
         }
     } catch (e: RuntimeException) {
         null
@@ -144,7 +145,7 @@ private fun getElement(key: String, parent: PsiElement): PsiElement? {
  * @param element the PsiElement whose "data" child should be found.
  * @return the PsiElement named "data"
  */
-fun getData(element: PsiElement): PsiElement? {
+fun getDataValue(element: PsiElement): PsiElement? {
     val dataElement = element.children
         .filterIsInstance<PsiNamedElement>()
         .find { it.name == KEY_DATA }

src/main/kotlin/com/redhat/devtools/intellij/kubernetes/validation/KubernetesSchemaProvider.kt

@@ -37,7 +37,7 @@ class KubernetesSchemaProvider(
 				if (psiFile == null) {
 					false
 				} else {
-					val fileInfo = KubernetesTypeInfo.extractMeta(psiFile)
+					val fileInfo = KubernetesTypeInfo.create(psiFile)
 					info == fileInfo
 				}
 			})

src/main/resources/META-INF/plugin.xml

@@ -234,7 +234,10 @@
         <editorTabTitleProvider implementation="com.redhat.devtools.intellij.kubernetes.editor.KubernetesEditorsTabTitleProvider"/>
         <codeInsight.inlayProvider language="yaml"
                                    implementationClass="com.redhat.devtools.intellij.kubernetes.editor.inlay.ResourceEditorInlayHintsProvider"
-                                   id="MarkdownTableInlayProvider"/>
+                                   id="com.redhat.devtools.intellij.kubernetes.editor.yaml.ResourceEditorInlayHintsProvider"/>
+        <codeInsight.inlayProvider language="JSON"
+                                   implementationClass="com.redhat.devtools.intellij.kubernetes.editor.inlay.ResourceEditorInlayHintsProvider"
+                                   id="com.redhat.devtools.intellij.kubernetes.editor.json.ResourceEditorInlayHintsProvider"/>
         <projectConfigurable id="tools.settings.redhat.kubernetes"
                              parentId="tools"
                              displayName="Red Hat Kubernetes"

src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/mocks/PsiElementMocks.kt

@@ -15,6 +15,7 @@ import com.intellij.json.psi.JsonProperty
 import com.intellij.json.psi.JsonValue
 import com.intellij.openapi.fileTypes.FileType
 import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.PsiFileFactory
 import com.nhaarman.mockitokotlin2.any
@@ -51,20 +52,34 @@ fun createJsonProperty(
 	name: String = Random.nextInt().toString(),
 	value: String? = null,
 	parent: JsonProperty? = null,
-	project: Project
+	project: Project = mock()
 ): JsonProperty {
 	val valueElement: JsonValue = mock {
 		on { getText() } doReturn value
 	}
 	return mock {
-		on { getValue() } doReturn valueElement
 		on { getName() } doReturn name
 		on { getValue() } doReturn valueElement
 		on { getParent() } doReturn parent
 		on { getProject() } doReturn project
 	}
 }
 
+fun createJsonObject(
+	name: String = Random.nextInt().toString(),
+	properties: List<JsonProperty> = emptyList(),
+	parent: PsiElement? = null,
+	project: Project = mock()
+): JsonObject {
+	return mock {
+		on { getChildren() } doReturn properties.toTypedArray()
+		on { getPropertyList() } doReturn properties
+		on { getName() } doReturn name
+		on { getParent() } doReturn parent
+		on { getProject() } doReturn project
+	}
+}
+
 fun createProjectWithServices(
 	yamlGenerator: YAMLElementGenerator? = null,
 	psiFileFactory: PsiFileFactory? = null

src/test/kotlin/com/redhat/devtools/intellij/kubernetes/editor/util/ResourceEditorUtilsTest.kt

@@ -11,11 +11,10 @@
 package com.redhat.devtools.intellij.kubernetes.editor.util
 
 import com.nhaarman.mockitokotlin2.mock
-import com.nhaarman.mockitokotlin2.verify
 import com.redhat.devtools.intellij.common.validation.KubernetesResourceInfo
 import com.redhat.devtools.intellij.common.validation.KubernetesTypeInfo
-import com.redhat.devtools.intellij.kubernetes.editor.mocks.createYAMLDocument
-import com.redhat.devtools.intellij.kubernetes.editor.mocks.createYAMLFile
+import com.redhat.devtools.intellij.kubernetes.editor.mocks.createJsonObject
+import com.redhat.devtools.intellij.kubernetes.editor.mocks.createJsonProperty
 import com.redhat.devtools.intellij.kubernetes.editor.mocks.createYAMLKeyValue
 import com.redhat.devtools.intellij.kubernetes.editor.mocks.createYAMLValue
 import com.redhat.devtools.intellij.kubernetes.model.mocks.Mocks.kubernetesResourceInfo
@@ -86,27 +85,38 @@ class ResourceEditorUtilsTest {
 	}
 
 	@Test
-	fun `#getData should return YAMLKeyValue named data`() {
+	fun `#getDataValue should return YAMLKeyValue named data`() {
 		// given
 		val data = createYAMLKeyValue("data")
 		val parent = createYAMLValue(arrayOf(data))
 		// when
-		val found = getData(parent)
+		val found = getDataValue(parent)
 		// then
 		assertThat(found).isNotNull()
 	}
 
 	@Test
-	fun `#getData should return null if there is no child named data`() {
+	fun `#getDataValue should return null if there is no child named data`() {
 		// given
 		val yoda = createYAMLKeyValue("yoda")
 		val parent = createYAMLValue(arrayOf(yoda))
 		// when
-		val found = getData(parent)
+		val found = getDataValue(parent)
 		// then
 		assertThat(found).isNull()
 	}
 
+	@Test
+	fun `#getDataValue should return JsonProperty named data`() {
+		// given
+		val data = createJsonProperty("data", value = "anakin")
+		val parent = createJsonObject(properties = listOf(data))
+		// when
+		val found = getDataValue(parent)
+		// then
+		assertThat(found?.text).isEqualTo("anakin")
+	}
+
 	@Test
 	fun `#getBinaryData should return YAMLKeyValue named binaryData`() {
 		// given