From 1e2dfc32123168ab9408bab31dc9889a6b5e4202 Mon Sep 17 00:00:00 2001 From: "Ketelsen, Sven" Date: Thu, 3 Feb 2022 21:01:09 +0000 Subject: [PATCH] SMARCH-112 feat: read docker images directly from harbor --- roles/management/defaults/main.yml | 7 ++++++ .../datasource-file/connect-versions.xlsx | Bin 8901 -> 0 bytes .../datasource/connect-versions.json | 1 - .../whitelabel-docker-image-tags-plain.json | 21 ++++++++++++++++++ .../whitelabel-docker-image-tags.json | 16 +++++++++++++ .../provisioning/form/simple-connect.json | 6 ++--- 6 files changed, 47 insertions(+), 4 deletions(-) delete mode 100644 smardigo/provisioning/datasource-file/connect-versions.xlsx delete mode 100644 smardigo/provisioning/datasource/connect-versions.json create mode 100644 smardigo/provisioning/datasource/whitelabel-docker-image-tags-plain.json create mode 100644 smardigo/provisioning/datasource/whitelabel-docker-image-tags.json diff --git a/roles/management/defaults/main.yml b/roles/management/defaults/main.yml index 5935f68..39cc972 100644 --- a/roles/management/defaults/main.yml +++ b/roles/management/defaults/main.yml @@ -13,3 +13,10 @@ connect_connections: authType: "BASIC_AUTH" username: "{{ awx_admin_username }}" password: "{{ awx_admin_password }}" +- id: "harbor" + name: "Harbor" + url: "https://{{ shared_service_harbor_hostname }}/v2/" + connectionType: "HTTP" + authType: "BASIC_AUTH" + username: "{{ harbor_admin_username }}" + password: "{{ harbor_admin_password }}" diff --git a/smardigo/provisioning/datasource-file/connect-versions.xlsx b/smardigo/provisioning/datasource-file/connect-versions.xlsx deleted file mode 100644 index dd0a37ab3915e90c315326fb08ea018a4d8ae555..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8901 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 diff --git a/smardigo/provisioning/datasource/connect-versions.json b/smardigo/provisioning/datasource/connect-versions.json deleted file mode 100644 index e60f521..0000000 --- a/smardigo/provisioning/datasource/connect-versions.json +++ /dev/null @@ -1 +0,0 @@ -{"name":"connect-versions","restApi":true,"configKey":"connect-versions","payloadType":"EXCEL","config":[{"name":"file","type":"FILE","value":"connect-versions.xlsx"},{"name":"columnNames","type":"STRING","value":"label,value"},{"name":"sqlStatement","type":"STRING","value":"SELECT * from version"},{"name":"columnNameLineNumber","type":"INT","value":1},{"name":"skipEmptyLines","type":"BOOLEAN","value":false},{"name":"skipEmptyColumns","type":"BOOLEAN","value":false}]} \ No newline at end of file diff --git a/smardigo/provisioning/datasource/whitelabel-docker-image-tags-plain.json b/smardigo/provisioning/datasource/whitelabel-docker-image-tags-plain.json new file mode 100644 index 0000000..80cebcc --- /dev/null +++ b/smardigo/provisioning/datasource/whitelabel-docker-image-tags-plain.json @@ -0,0 +1,21 @@ +{ + "name" : "whitelabel-docker-image-tags-plain", + "restApi" : true, + "configKey" : "whitelabel-docker-image-tags-plain", + "payloadType" : "REST", + "config" : [ { + "name" : "connection", + "type" : "CONNECTION", + "value" : "harbor" + }, + { + "name" : "resource", + "type" : "STRING", + "value" : "/smardigo/connect-whitelabel-app/tags/list" + }, + { + "name" : "sqlStatement", + "type" : "STRING", + "value" : "SELECT * FROM default_table" + } ] +} diff --git a/smardigo/provisioning/datasource/whitelabel-docker-image-tags.json b/smardigo/provisioning/datasource/whitelabel-docker-image-tags.json new file mode 100644 index 0000000..9307b6e --- /dev/null +++ b/smardigo/provisioning/datasource/whitelabel-docker-image-tags.json @@ -0,0 +1,16 @@ +{ + "name" : "whitelabel-docker-image-tags", + "restApi" : true, + "configKey" : "whitelabel-docker-image-tags", + "payloadType" : "POST_PROCESSING", + "config" : [ { + "name" : "datasource_key", + "type" : "STRING", + "value" : "whitelabel-docker-image-tags-plain" + }, + { + "name" : "groovy_script", + "type" : "STRING", + "value" : "def result = []\ndata.each{values ->\n values.tags.each{ value ->\n result.add([value: value, label: value])\n }\n}\nresult" + } ] +} diff --git a/smardigo/provisioning/form/simple-connect.json b/smardigo/provisioning/form/simple-connect.json index 71c3e71..41e6e36 100644 --- a/smardigo/provisioning/form/simple-connect.json +++ b/smardigo/provisioning/form/simple-connect.json @@ -892,7 +892,7 @@ "type" : "select", "input" : true, "key" : "version", - "defaultValue" : "8.5.26", + "defaultValue" : "latest", "validate" : { "select" : false, "customMessage" : "", @@ -908,7 +908,7 @@ "eq" : "" }, "data" : { - "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/connect-versions/query", + "url" : "api/v1/scopes/{{context.scopeId}}/tags/{{context.scopeTag}}/datasources/whitelabel-docker-image-tags/query", "headers" : [ { "key" : "", "value" : "" @@ -931,7 +931,7 @@ "tags" : null, "customConditional" : "", "logic" : [ ], - "customDefaultValue" : "value='8.5.26'", + "customDefaultValue" : "value='latest'", "reorder" : false, "reference" : false, "placeholder" : "",