Include both Keystone 2/3 profiles by default.

iterate-ch · Feb 26, 2020 · 2e29d5b · 2e29d5b
1 parent 39b3e93
commit 2e29d5b
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 39 deletions.
diff --git a/cli/src/test/java/ch/cyberduck/cli/CommandLineUriParserTest.java b/cli/src/test/java/ch/cyberduck/cli/CommandLineUriParserTest.java
@@ -93,7 +93,7 @@ public void testCustomProvider() throws Exception {
         final Profile rackspace = new ProfilePlistReader(factory).read(this.getClass().getResourceAsStream("/Rackspace US.cyberduckprofile"));
         assertEquals(new SwiftProtocol(), rackspace.getProtocol());
         factory.register(rackspace);
-        final Profile generic = new ProfilePlistReader(factory).read(this.getClass().getResourceAsStream("/Swift.cyberduckprofile"));
+        final Profile generic = new ProfilePlistReader(factory).read(this.getClass().getResourceAsStream("/Openstack Swift (Keystone 2).cyberduckprofile"));
         assertEquals(new SwiftProtocol(), generic.getProtocol());
         factory.register(generic);
         assertEquals(rackspace, new CommandLineUriParser(input, factory).parse("rackspace://container//").getProtocol());

diff --git a/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftProtocol.java b/openstack/src/main/java/ch/cyberduck/core/openstack/SwiftProtocol.java
@@ -49,16 +49,6 @@ public boolean isHostnameConfigurable() {
         return true;
     }
 
-    @Override
-    public String getUsernamePlaceholder() {
-        return "Tenant ID:Access Key";
-    }
-
-    @Override
-    public String getPasswordPlaceholder() {
-        return "Secret Key";
-    }
-
     @Override
     public String getContext() {
         return PreferencesFactory.get().getProperty("openstack.authentication.context");

diff --git a/openstack/src/test/java/ch/cyberduck/core/HostParserTest.java b/openstack/src/test/java/ch/cyberduck/core/HostParserTest.java
@@ -30,7 +30,7 @@ public class HostParserTest {
     @Test
     public void testParseCustomHostname() throws Exception {
         final ProtocolFactory factory = new ProtocolFactory(new LinkedHashSet<>(Collections.singletonList(new SwiftProtocol())));
-        factory.register(new ProfilePlistReader(factory).read(this.getClass().getResourceAsStream("/Swift.cyberduckprofile")));
+        factory.register(new ProfilePlistReader(factory).read(this.getClass().getResourceAsStream("/Openstack Swift (Keystone 2).cyberduckprofile")));
         final Host host = new HostParser(factory).get("swift://auth.cloud.ovh.net/container/");
         assertEquals("auth.cloud.ovh.net", host.getHostname());
         assertEquals(Protocol.Type.swift, host.getProtocol().getType());

diff --git a/profiles/default/Openstack Swift (Keystone 2).cyberduckprofile b/profiles/default/Openstack Swift (Keystone 2).cyberduckprofile
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Protocol</key>
+        <string>swift</string>
+        <key>Vendor</key>
+        <string>keystone2</string>
+        <key>Context</key>
+        <string>/v2.0/tokens</string>
+        <key>Description</key>
+        <string>OpenStack Swift (Keystone 2.0)</string>
+        <key>Username Placeholder</key>
+        <string>Tenant ID:Access Key</string>
+        <key>Password Placeholder</key>
+        <string>Secret Key</string>
+    </dict>
+</plist>
diff --git a/profiles/default/Openstack Swift (Keystone 3).cyberduckprofile b/profiles/default/Openstack Swift (Keystone 3).cyberduckprofile
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Protocol</key>
+        <string>swift</string>
+        <key>Vendor</key>
+        <string>keystone3</string>
+        <key>Context</key>
+        <string>/v3/auth/tokens</string>
+        <key>Description</key>
+        <string>OpenStack Swift (Keystone 3)</string>
+        <key>Username Placeholder</key>
+        <string>Project:Domain:Username</string>
+        <key>Password Placeholder</key>
+        <string>Password</string>
+    </dict>
+</plist>
diff --git a/profiles/default/Swift.cyberduckprofile b/profiles/default/Swift.cyberduckprofile