Merge pull request #71 from atc-/0.9.0

Alex Collins · Alex Collins · commit f0a99875275e · 2014-08-03T12:33:51.000+01:00
0.9.0
diff --git a/application.properties b/application.properties
@@ -2,4 +2,4 @@
 #Wed Jul 09 18:55:10 BST 2014
 app.grails.version=2.4.2
 app.name=docker-registry-ui
-app.version=0.8.1
+app.version=0.9.0
diff --git a/grails-app/conf/BootStrap.groovy b/grails-app/conf/BootStrap.groovy
@@ -1,6 +1,5 @@
 import docker.registry.web.Registry
 import docker.registry.web.User
-import groovyx.net.http.URIBuilder
 
 class BootStrap {
 
@@ -16,24 +15,27 @@ class BootStrap {
         System.getenv().each { key, urlStr ->
             if (key.matches("REG(\\d)")) {
                 log.info("Found registry $urlStr. Creating...")
-                def m = urlStr =~ /.*(v\d).*/
+                def reg = Registry.fromUrl(urlStr)
 
-                if (m.matches()) {
-                    def reg = new Registry()
-                    reg.url = urlStr.replaceAll("/(v\\d)/", "") // remove API version
-                    reg.apiVersion = m.group(1) // extracts e.g. v1 from url
-                    reg.save()
+                if (reg) {
+                    if (Registry.findByHostAndApiVersion(reg.host, reg.apiVersion)) {
+                        log.info("Not creating registry ${urlStr} as it already exists")
+                    } else {
+                        log.info("Registry ${reg} doesn't exist; saving")
+                        reg.save()
+                    }
 
                     if (!reg.ping()) {
                         log.warn("Registry '${reg.toUrl()}' ping failed! Check it's up!")
                     }
 
                 } else {
-                    log.error("Couldn't parse the API version from $regUrl")
+                    log.error("Couldn't parse valid registry URL from $urlStr")
                 }
             }
         }
     }
+
     def destroy = {
     }
 }
diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy
@@ -70,7 +70,6 @@ grails.project.dependency.resolution = {
         compile ":jquery-ui:1.10.3"
         compile ":jquery-datatables:1.7.5"
         compile ":spring-security-core:2.0-RC3"
-        compile ":dwr:0.1"
 
         // plugins needed at runtime but not for compilation
         runtime ":hibernate4:4.3.5.3"
diff --git a/grails-app/conf/DwrConfigBootStrap.groovy b/grails-app/conf/DwrConfigBootStrap.groovy
diff --git a/grails-app/domain/docker/registry/web/Registry.groovy b/grails-app/domain/docker/registry/web/Registry.groovy
@@ -1,18 +1,30 @@
 package docker.registry.web
 
+import groovyx.net.http.HTTPBuilder
+
 class Registry {
-    String url
-    String apiVersion
+    String host = "localhost"
+    int port
+    String apiVersion = "v1"
+    String username
+    String password
 
     def repositoryService
 
     static constraints = {
+        username nullable: true
+        password nullable: true
     }
 
-    static transients = ['toUrl', 'repositories', 'ping']
+    static transients = ['toUrl', 'repositories', 'ping', 'fromUrl']
 
     def toUrl() {
-        return "${this.url}/${this.apiVersion}"
+        def urlString = "http://${this.host}:${this.port}/${this.apiVersion}"
+        if (username) {
+            if (password) urlString = urlString.replace("://", "://$username:$password@")
+            else urlString = urlString.replace("://", "://$username@")
+        }
+        urlString
     }
 
     def getRepositories() {
@@ -23,12 +35,37 @@ class Registry {
         repositoryService.ping(this)
     }
 
+    /**
+     * Static factory method for creating an instance from a URL.
+     * @param urlStr a url in the format: http://hostOrIP:OptionalPort/v1/
+     **/
+    static def fromUrl(final String urlStr) {
+        if (urlStr?.endsWith("/v1/")) { //FIXME this won't work for new api versions
+            def url = urlStr.toURL()
+            if (url) {
+                def auth = url.userInfo?.split(":")
+                return new Registry(
+                        host: url.host,
+                        port: url.port == -1 ? 80 : url.port,
+                        apiVersion: url.path.replaceAll("\\p{Punct}", ""),
+                        username: auth?.length > 0 ? auth[0] : null,
+                        password: auth?.length > 1 ? auth[1] : null
+                )
+            }
+        }
+        null
+    }
+
     @Override
     public String toString() {
         return "Registry{" +
                 "id=" + id +
-                ", url='" + url + '\'' +
+                ", host='" + host + '\'' +
+                ", port=" + port +
                 ", apiVersion='" + apiVersion + '\'' +
+                ", username='" + username + '\'' +
+                ", password='" + password + '\'' +
+                ", repositoryService=" + repositoryService +
                 ", version=" + version +
                 '}';
     }
diff --git a/grails-app/i18n/messages.properties b/grails-app/i18n/messages.properties
@@ -80,3 +80,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_cs_CZ.properties b/grails-app/i18n/messages_cs_CZ.properties
@@ -80,3 +80,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_da.properties b/grails-app/i18n/messages_da.properties
@@ -80,4 +80,12 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
 
diff --git a/grails-app/i18n/messages_de.properties b/grails-app/i18n/messages_de.properties
@@ -80,3 +80,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_es.properties b/grails-app/i18n/messages_es.properties
@@ -79,4 +79,12 @@ registry.url.label=URL
 ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
-labels.registry.ping=Pingable?
+labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_fr.properties b/grails-app/i18n/messages_fr.properties
@@ -44,3 +44,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_it.properties b/grails-app/i18n/messages_it.properties
@@ -80,3 +80,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_ja.properties b/grails-app/i18n/messages_ja.properties
@@ -80,3 +80,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_nb.properties b/grails-app/i18n/messages_nb.properties
@@ -80,4 +80,12 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
 
diff --git a/grails-app/i18n/messages_nl.properties b/grails-app/i18n/messages_nl.properties
@@ -80,3 +80,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_pl.properties b/grails-app/i18n/messages_pl.properties
@@ -84,3 +84,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_pt_BR.properties b/grails-app/i18n/messages_pt_BR.properties
@@ -83,4 +83,12 @@ registry.url.label=URL
 ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
-labels.registry.ping=Pingable?
+labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_pt_PT.properties b/grails-app/i18n/messages_pt_PT.properties
@@ -59,3 +59,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_ru.properties b/grails-app/i18n/messages_ru.properties
@@ -56,3 +56,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_sv.properties b/grails-app/i18n/messages_sv.properties
@@ -79,4 +79,12 @@ registry.url.label=URL
 ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
-labels.registry.ping=Pingable?
+labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_th.properties b/grails-app/i18n/messages_th.properties
@@ -80,3 +80,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/i18n/messages_zh_CN.properties b/grails-app/i18n/messages_zh_CN.properties
@@ -43,3 +43,11 @@ ui.dialog.button.deleteTag=Delete tag
 registry.ping.failed=Ping failed\!
 registry.ping.succeeded=Ping succeeded
 labels.registry.ping=Pingable?
+registry.host.label=Hostname
+registry.port.label=Port
+registry.password.label=Password
+registry.username.label=Username
+labels.registry.host=Hostname
+labels.registry.port=Port
+labels.registry.username=Username
+labels.registry.password=Password
diff --git a/grails-app/services/docker/registry/web/RepositoryService.groovy b/grails-app/services/docker/registry/web/RepositoryService.groovy
diff --git a/grails-app/views/registry/_form.gsp b/grails-app/views/registry/_form.gsp
diff --git a/grails-app/views/registry/index.gsp b/grails-app/views/registry/index.gsp
diff --git a/grails-app/views/registry/show.gsp b/grails-app/views/registry/show.gsp
diff --git a/grails-app/views/repository/index.gsp b/grails-app/views/repository/index.gsp
diff --git a/test/integration/docker/registry/ui/RepositoryServiceIntegrationTestSpec.groovy b/test/integration/docker/registry/ui/RepositoryServiceIntegrationTestSpec.groovy
diff --git a/test/unit/docker/registry/web/RegistrySpec.groovy b/test/unit/docker/registry/web/RegistrySpec.groovy

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`import docker.registry.web.Registry`
`2`	`2`	`import docker.registry.web.User`
`3`		`-import groovyx.net.http.URIBuilder`
`4`	`3`
`5`	`4`	`class BootStrap {`
`6`	`5`
`@@ -16,24 +15,27 @@ class BootStrap {`
`16`	`15`	`System.getenv().each { key, urlStr ->`
`17`	`16`	`if (key.matches("REG(\\d)")) {`
`18`	`17`	`log.info("Found registry $urlStr. Creating...")`
`19`		`- def m = urlStr =~ /.(v\d)./`
	`18`	`+ def reg = Registry.fromUrl(urlStr)`
`20`	`19`
`21`		`- if (m.matches()) {`
`22`		`- def reg = new Registry()`
`23`		`- reg.url = urlStr.replaceAll("/(v\\d)/", "") // remove API version`
`24`		`- reg.apiVersion = m.group(1) // extracts e.g. v1 from url`
`25`		`- reg.save()`
	`20`	`+ if (reg) {`
	`21`	`+ if (Registry.findByHostAndApiVersion(reg.host, reg.apiVersion)) {`
	`22`	`+ log.info("Not creating registry ${urlStr} as it already exists")`
	`23`	`+ } else {`
	`24`	`+ log.info("Registry ${reg} doesn't exist; saving")`
	`25`	`+ reg.save()`
	`26`	`+ }`
`26`	`27`
`27`	`28`	`if (!reg.ping()) {`
`28`	`29`	`log.warn("Registry '${reg.toUrl()}' ping failed! Check it's up!")`
`29`	`30`	`}`
`30`	`31`
`31`	`32`	`} else {`
`32`		`- log.error("Couldn't parse the API version from $regUrl")`
	`33`	`+ log.error("Couldn't parse valid registry URL from $urlStr")`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`	`}`
	`38`	`+`
`37`	`39`	`def destroy = {`
`38`	`40`	`}`
`39`	`41`	`}`