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 dd0a37a..0000000 Binary files a/smardigo/provisioning/datasource-file/connect-versions.xlsx and /dev/null differ 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" : "",