Move AT DSL to fixtures sourceset (#13)

Consensys · Mar 16, 2020 · 0377ab6 · 0377ab6
1 parent dbcb445
commit 0377ab6
Show file tree

Hide file tree

Showing 29 changed files with 72 additions and 78 deletions.
diff --git a/acceptance-tests/build.gradle b/acceptance-tests/build.gradle
@@ -27,8 +27,6 @@ dependencies {
 
   testImplementation 'org.apache.logging.log4j:log4j-api'
   testImplementation 'org.assertj:assertj-core'
-  testImplementation 'org.awaitility:awaitility'
-  testImplementation 'org.apache.tuweni:tuweni-net'
   testImplementation(testFixtures(project(":keystorage:hashicorp")))
 }
 

diff --git a/...a/tech/pegasys/signers/keystorage/hashicorp/tests/HashicorpVaultAccessAcceptanceTest.java b/...a/tech/pegasys/signers/keystorage/hashicorp/tests/HashicorpVaultAccessAcceptanceTest.java
@@ -14,14 +14,14 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import tech.pegasys.signers.dsl.DockerClientFactory;
-import tech.pegasys.signers.dsl.certificates.CertificateHelpers;
-import tech.pegasys.signers.dsl.hashicorp.HashicorpNode;
-import tech.pegasys.signing.hashicorp.HashicorpConnection;
-import tech.pegasys.signing.hashicorp.HashicorpConnectionFactory;
-import tech.pegasys.signing.hashicorp.config.HashicorpKeyConfig;
-import tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader;
-import tech.pegasys.signing.hashicorp.util.HashicorpConfigUtil;
+import tech.pegasys.signers.hashicorp.HashicorpConnection;
+import tech.pegasys.signers.hashicorp.HashicorpConnectionFactory;
+import tech.pegasys.signers.hashicorp.config.HashicorpKeyConfig;
+import tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader;
+import tech.pegasys.signers.hashicorp.dsl.DockerClientFactory;
+import tech.pegasys.signers.hashicorp.dsl.HashicorpNode;
+import tech.pegasys.signers.hashicorp.dsl.certificates.CertificateHelpers;
+import tech.pegasys.signers.hashicorp.util.HashicorpConfigUtil;
 
 import java.io.IOException;
 import java.nio.file.Path;
@@ -42,7 +42,7 @@ public class HashicorpVaultAccessAcceptanceTest {
   private static final Logger LOG = LogManager.getLogger();
 
   private final Vertx vertx = Vertx.vertx();
-  final DockerClient docker = new DockerClientFactory().create();
+  private final DockerClient docker = new DockerClientFactory().create();
   private HashicorpNode hashicorpNode;
 
   private final String SECRET_KEY = "storedSecetKey";

diff --git a/keystorage/hashicorp/build.gradle b/keystorage/hashicorp/build.gradle
@@ -50,12 +50,8 @@ dependencies {
   integrationTestImplementation sourceSets.testFixtures.output
 
   testFixturesImplementation 'com.github.docker-java:docker-java'
-  testFixturesImplementation 'org.apache.logging.log4j:log4j-core'
-  testFixturesImplementation 'org.apache.logging.log4j:log4j-slf4j-impl'
   testFixturesImplementation 'org.apache.logging.log4j:log4j-api'
   testFixturesImplementation 'org.assertj:assertj-core'
   testFixturesImplementation 'org.awaitility:awaitility'
   testFixturesImplementation 'org.apache.tuweni:tuweni-net'
-  testFixturesImplementation 'org.junit.jupiter:junit-jupiter-engine'
-  testFixturesImplementation 'org.bouncycastle:bcpkix-jdk15on'
 }
diff --git a/...g/hashicorp/HashicorpIntegrationTest.java → ...s/hashicorp/HashicorpIntegrationTest.java b/...g/hashicorp/HashicorpIntegrationTest.java → ...s/hashicorp/HashicorpIntegrationTest.java
@@ -10,18 +10,18 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockserver.configuration.ConfigurationProperties.javaKeyStoreFilePath;
 import static org.mockserver.configuration.ConfigurationProperties.javaKeyStorePassword;
 import static org.mockserver.model.HttpRequest.request;
 import static org.mockserver.model.HttpResponse.response;
-import static tech.pegasys.signing.hashicorp.util.HashicorpConfigUtil.createConfigFile;
+import static tech.pegasys.signers.hashicorp.util.HashicorpConfigUtil.createConfigFile;
 
-import tech.pegasys.signing.hashicorp.config.HashicorpKeyConfig;
-import tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader;
+import tech.pegasys.signers.hashicorp.config.HashicorpKeyConfig;
+import tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader;
 
 import java.io.IOException;
 import java.nio.file.Path;

diff --git a/...igning/hashicorp/HashicorpConnection.java → ...igners/hashicorp/HashicorpConnection.java b/...igning/hashicorp/HashicorpConnection.java → ...igners/hashicorp/HashicorpConnection.java
@@ -10,11 +10,11 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import static io.vertx.core.http.HttpMethod.GET;
 
-import tech.pegasys.signing.hashicorp.config.KeyDefinition;
+import tech.pegasys.signers.hashicorp.config.KeyDefinition;
 
 import java.util.Map;
 import java.util.Optional;

diff --git a/...hashicorp/HashicorpConnectionFactory.java → ...hashicorp/HashicorpConnectionFactory.java b/...hashicorp/HashicorpConnectionFactory.java → ...hashicorp/HashicorpConnectionFactory.java
@@ -10,10 +10,10 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
-import tech.pegasys.signing.hashicorp.config.ConnectionParameters;
-import tech.pegasys.signing.hashicorp.config.TlsOptions;
+import tech.pegasys.signers.hashicorp.config.ConnectionParameters;
+import tech.pegasys.signers.hashicorp.config.TlsOptions;
 
 import io.vertx.core.Vertx;
 import io.vertx.core.http.HttpClient;

diff --git a/...signing/hashicorp/HashicorpException.java → ...signers/hashicorp/HashicorpException.java b/...signing/hashicorp/HashicorpException.java → ...signers/hashicorp/HashicorpException.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 public class HashicorpException extends RuntimeException {
 

diff --git a/.../hashicorp/HashicorpKVResponseMapper.java → .../hashicorp/HashicorpKVResponseMapper.java b/.../hashicorp/HashicorpKVResponseMapper.java → .../hashicorp/HashicorpKVResponseMapper.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import java.util.Collections;
 import java.util.Map;

diff --git a/...sys/signing/hashicorp/TrustStoreType.java → ...sys/signers/hashicorp/TrustStoreType.java b/...sys/signing/hashicorp/TrustStoreType.java → ...sys/signers/hashicorp/TrustStoreType.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import java.util.EnumSet;
 import java.util.Optional;

diff --git a/...ashicorp/config/ConnectionParameters.java → ...ashicorp/config/ConnectionParameters.java b/...ashicorp/config/ConnectionParameters.java → ...ashicorp/config/ConnectionParameters.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.config;
+package tech.pegasys.signers.hashicorp.config;
 
 import java.util.Optional;
 

diff --git a/.../hashicorp/config/HashicorpKeyConfig.java → .../hashicorp/config/HashicorpKeyConfig.java b/.../hashicorp/config/HashicorpKeyConfig.java → .../hashicorp/config/HashicorpKeyConfig.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.config;
+package tech.pegasys.signers.hashicorp.config;
 
 public class HashicorpKeyConfig {
 

diff --git a/...gning/hashicorp/config/KeyDefinition.java → ...gners/hashicorp/config/KeyDefinition.java b/...gning/hashicorp/config/KeyDefinition.java → ...gners/hashicorp/config/KeyDefinition.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.config;
+package tech.pegasys.signers.hashicorp.config;
 
 import java.util.Optional;
 

diff --git a/.../signing/hashicorp/config/TlsOptions.java → .../signers/hashicorp/config/TlsOptions.java b/.../signing/hashicorp/config/TlsOptions.java → .../signers/hashicorp/config/TlsOptions.java
@@ -10,9 +10,9 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.config;
+package tech.pegasys.signers.hashicorp.config;
 
-import tech.pegasys.signing.hashicorp.TrustStoreType;
+import tech.pegasys.signers.hashicorp.TrustStoreType;
 
 import java.nio.file.Path;
 import java.util.Optional;

diff --git a/.../config/loader/toml/TomlConfigLoader.java → .../config/loader/toml/TomlConfigLoader.java b/.../config/loader/toml/TomlConfigLoader.java → .../config/loader/toml/TomlConfigLoader.java
@@ -10,14 +10,14 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.config.loader.toml;
-
-import tech.pegasys.signing.hashicorp.HashicorpException;
-import tech.pegasys.signing.hashicorp.TrustStoreType;
-import tech.pegasys.signing.hashicorp.config.ConnectionParameters;
-import tech.pegasys.signing.hashicorp.config.HashicorpKeyConfig;
-import tech.pegasys.signing.hashicorp.config.KeyDefinition;
-import tech.pegasys.signing.hashicorp.config.TlsOptions;
+package tech.pegasys.signers.hashicorp.config.loader.toml;
+
+import tech.pegasys.signers.hashicorp.HashicorpException;
+import tech.pegasys.signers.hashicorp.TrustStoreType;
+import tech.pegasys.signers.hashicorp.config.ConnectionParameters;
+import tech.pegasys.signers.hashicorp.config.HashicorpKeyConfig;
+import tech.pegasys.signers.hashicorp.config.KeyDefinition;
+import tech.pegasys.signers.hashicorp.config.TlsOptions;
 
 import java.nio.file.Path;
 import java.util.Arrays;

diff --git a/...hicorp/config/loader/toml/TomlParser.java → ...hicorp/config/loader/toml/TomlParser.java b/...hicorp/config/loader/toml/TomlParser.java → ...hicorp/config/loader/toml/TomlParser.java
@@ -10,9 +10,9 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.config.loader.toml;
+package tech.pegasys.signers.hashicorp.config.loader.toml;
 
-import tech.pegasys.signing.hashicorp.HashicorpException;
+import tech.pegasys.signers.hashicorp.HashicorpException;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/...icorp/HashicorpConnectionFactoryTest.java → ...icorp/HashicorpConnectionFactoryTest.java b/...icorp/HashicorpConnectionFactoryTest.java → ...icorp/HashicorpConnectionFactoryTest.java
@@ -10,12 +10,12 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import tech.pegasys.signing.hashicorp.config.ConnectionParameters;
-import tech.pegasys.signing.hashicorp.config.TlsOptions;
+import tech.pegasys.signers.hashicorp.config.ConnectionParameters;
+import tech.pegasys.signers.hashicorp.config.TlsOptions;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...hicorp/HashicorpKVResponseMapperTest.java → ...hicorp/HashicorpKVResponseMapperTest.java b/...hicorp/HashicorpKVResponseMapperTest.java → ...hicorp/HashicorpKVResponseMapperTest.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 

diff --git a/...dVertxHashicorpConnectionFactoryTest.java → ...dVertxHashicorpConnectionFactoryTest.java b/...dVertxHashicorpConnectionFactoryTest.java → ...dVertxHashicorpConnectionFactoryTest.java
@@ -10,15 +10,15 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 
-import tech.pegasys.signing.hashicorp.config.ConnectionParameters;
-import tech.pegasys.signing.hashicorp.config.TlsOptions;
+import tech.pegasys.signers.hashicorp.config.ConnectionParameters;
+import tech.pegasys.signers.hashicorp.config.TlsOptions;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...signing/hashicorp/TrustStoreTypeTest.java → ...signers/hashicorp/TrustStoreTypeTest.java b/...signing/hashicorp/TrustStoreTypeTest.java → ...signers/hashicorp/TrustStoreTypeTest.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp;
+package tech.pegasys.signers.hashicorp;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 

diff --git a/...ashicorp/loader/TomlConfigLoaderTest.java → ...ashicorp/loader/TomlConfigLoaderTest.java b/...ashicorp/loader/TomlConfigLoaderTest.java → ...ashicorp/loader/TomlConfigLoaderTest.java
@@ -10,17 +10,17 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.loader;
+package tech.pegasys.signers.hashicorp.loader;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import tech.pegasys.signing.hashicorp.HashicorpException;
-import tech.pegasys.signing.hashicorp.TrustStoreType;
-import tech.pegasys.signing.hashicorp.config.HashicorpKeyConfig;
-import tech.pegasys.signing.hashicorp.config.TlsOptions;
-import tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader;
-import tech.pegasys.signing.hashicorp.util.HashicorpConfigUtil;
+import tech.pegasys.signers.hashicorp.HashicorpException;
+import tech.pegasys.signers.hashicorp.TrustStoreType;
+import tech.pegasys.signers.hashicorp.config.HashicorpKeyConfig;
+import tech.pegasys.signers.hashicorp.config.TlsOptions;
+import tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader;
+import tech.pegasys.signers.hashicorp.util.HashicorpConfigUtil;
 
 import java.io.IOException;
 import java.nio.file.Path;

diff --git a/...asys/signers/dsl/DockerClientFactory.java → ...rs/hashicorp/dsl/DockerClientFactory.java b/...asys/signers/dsl/DockerClientFactory.java → ...rs/hashicorp/dsl/DockerClientFactory.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl;
+package tech.pegasys.signers.hashicorp.dsl;
 
 import com.github.dockerjava.api.DockerClient;
 import com.github.dockerjava.api.command.DockerCmdExecFactory;

diff --git a/.../signers/dsl/hashicorp/HashicorpNode.java → .../signers/hashicorp/dsl/HashicorpNode.java b/.../signers/dsl/hashicorp/HashicorpNode.java → .../signers/hashicorp/dsl/HashicorpNode.java
@@ -10,9 +10,9 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl.hashicorp;
+package tech.pegasys.signers.hashicorp.dsl;
 
-import tech.pegasys.signers.dsl.certificates.SelfSignedCertificate;
+import tech.pegasys.signers.hashicorp.dsl.certificates.SelfSignedCertificate;
 
 import java.util.Map;
 import java.util.Optional;

diff --git a/...dsl/hashicorp/HashicorpVaultCommands.java → ...hashicorp/dsl/HashicorpVaultCommands.java b/...dsl/hashicorp/HashicorpVaultCommands.java → ...hashicorp/dsl/HashicorpVaultCommands.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl.hashicorp;
+package tech.pegasys.signers.hashicorp.dsl;
 
 // This assumes there is a Vault Server running at the vault URL (for AT, typically in a docker)
 public class HashicorpVaultCommands {

diff --git a/...s/dsl/hashicorp/HashicorpVaultDocker.java → ...s/hashicorp/dsl/HashicorpVaultDocker.java b/...s/dsl/hashicorp/HashicorpVaultDocker.java → ...s/hashicorp/dsl/HashicorpVaultDocker.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl.hashicorp;
+package tech.pegasys.signers.hashicorp.dsl;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;

diff --git a/...corp/HashicorpVaultDockerCertificate.java → .../dsl/HashicorpVaultDockerCertificate.java b/...corp/HashicorpVaultDockerCertificate.java → .../dsl/HashicorpVaultDockerCertificate.java
@@ -10,11 +10,11 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl.hashicorp;
+package tech.pegasys.signers.hashicorp.dsl;
 
 import static java.nio.file.Files.createTempDirectory;
 
-import tech.pegasys.signers.dsl.certificates.SelfSignedCertificate;
+import tech.pegasys.signers.hashicorp.dsl.certificates.SelfSignedCertificate;
 
 import java.io.IOException;
 import java.nio.file.Path;

diff --git a/...s/dsl/hashicorp/HashicorpVaultTokens.java → ...s/hashicorp/dsl/HashicorpVaultTokens.java b/...s/dsl/hashicorp/HashicorpVaultTokens.java → ...s/hashicorp/dsl/HashicorpVaultTokens.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl.hashicorp;
+package tech.pegasys.signers.hashicorp.dsl;
 
 public class HashicorpVaultTokens {
   private final String unsealKey;

diff --git a/.../dsl/certificates/CertificateHelpers.java → .../dsl/certificates/CertificateHelpers.java b/.../dsl/certificates/CertificateHelpers.java → .../dsl/certificates/CertificateHelpers.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl.certificates;
+package tech.pegasys.signers.hashicorp.dsl.certificates;
 
 import java.io.FileOutputStream;
 import java.io.IOException;

diff --git a/...l/certificates/SelfSignedCertificate.java → ...l/certificates/SelfSignedCertificate.java b/...l/certificates/SelfSignedCertificate.java → ...l/certificates/SelfSignedCertificate.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signers.dsl.certificates;
+package tech.pegasys.signers.hashicorp.dsl.certificates;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 

diff --git a/...g/hashicorp/util/HashicorpConfigUtil.java → ...s/hashicorp/util/HashicorpConfigUtil.java b/...g/hashicorp/util/HashicorpConfigUtil.java → ...s/hashicorp/util/HashicorpConfigUtil.java
@@ -10,21 +10,21 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package tech.pegasys.signing.hashicorp.util;
+package tech.pegasys.signers.hashicorp.util;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.nio.file.Files.createTempFile;
 import static java.nio.file.Files.writeString;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_KEY_NAME;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_KEY_PATH;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_SERVER_HOST;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_SERVER_PORT;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TIMEOUT;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_ENABLE;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_TS_PASSWORD;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_TS_PATH;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_TS_TYPE;
-import static tech.pegasys.signing.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TOKEN;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_KEY_NAME;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_KEY_PATH;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_SERVER_HOST;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_SERVER_PORT;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TIMEOUT;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_ENABLE;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_TS_PASSWORD;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_TS_PATH;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TLS_TS_TYPE;
+import static tech.pegasys.signers.hashicorp.config.loader.toml.TomlConfigLoader.PROP_HASHICORP_TOKEN;
 
 import java.io.IOException;
 import java.nio.file.Path;