From f74c1e04f019c84ba9a5119a070050e8bc3ea540 Mon Sep 17 00:00:00 2001
From: Jeff Ortel <jortel@redhat.com>
Date: Thu, 28 Mar 2024 07:55:12 -0700
Subject: [PATCH] checkpoint

Signed-off-by: Jeff Ortel <jortel@redhat.com>
---
 Dockerfile      |  2 +-
 cmd/settings.go |  2 +-
 settings.json   | 22 ----------------------
 settings.yaml   |  5 +++++
 4 files changed, 7 insertions(+), 24 deletions(-)
 delete mode 100644 settings.json
 create mode 100644 settings.yaml

diff --git a/Dockerfile b/Dockerfile
index 989a98e..b5ca68f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,6 +21,6 @@ ENV HOME=/addon ADDON=/addon
 WORKDIR /addon
 ARG GOPATH=/opt/app-root
 COPY --from=shim /usr/bin/windup-shim /usr/bin
-COPY --from=addon $GOPATH/src/settings.json $ADDON/opt/settings.json
+COPY --from=addon $GOPATH/src/settings.yaml $ADDON/opt/settings.yaml
 COPY --from=addon $GOPATH/src/bin/addon /usr/bin
 ENTRYPOINT ["/usr/bin/addon"]
diff --git a/cmd/settings.go b/cmd/settings.go
index 1b0c6da..b0f3cd5 100644
--- a/cmd/settings.go
+++ b/cmd/settings.go
@@ -181,5 +181,5 @@ func (r *Settings) getProxy(kind string) (url string, excluded []string, err err
 
 // Path returns the file path.
 func (r *Settings) path() (p string) {
-	return path.Join(OptDir, "settings.json")
+	return path.Join(OptDir, "settings.yaml")
 }
diff --git a/settings.json b/settings.json
deleted file mode 100644
index f66754a..0000000
--- a/settings.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-    {
-        "name": "go",
-        "binaryPath": "/usr/bin/generic-external-provider",
-        "initConfig": [
-            {
-                "analysisMode": "full",
-                "providerSpecificConfig": {
-                    "name": "go",
-                    "lspServerPath": "/root/go/bin/gopls",
-                    "dependencyProviderPath": "/usr/bin/golang-dependency-provider"
-            }
-        }
-        ]
-    },
-    {
-        "name": "builtin",
-        "initConfig": [
-            {}
-        ]
-    }
-]
diff --git a/settings.yaml b/settings.yaml
new file mode 100644
index 0000000..bfa6c6e
--- /dev/null
+++ b/settings.yaml
@@ -0,0 +1,5 @@
+---
+- name: builtin
+  initConfig:
+  - {}
+