Rename "pubreg" files to "pubs"

README.md

@@ -4,7 +4,7 @@ Okdata CLI provides a unified interface to data services for Oslo Origo teams.
 
 * [Install](doc/install.md)
 * [Configuration](doc/configuration.md)
-* [Public services](doc/pubreg.md)
+* [Public services](doc/pubs.md)
 * [Teams](doc/teams.md)
 * [Datasets](doc/datasets.md)
 * [Permissions](doc/permissions.md)

okdata/cli/__main__.py

@@ -9,7 +9,7 @@
 from okdata.cli.command import BaseCommand
 from okdata.cli.commands.datasets import DatasetsCommand
 from okdata.cli.commands.permissions import PermissionsCommand
-from okdata.cli.commands.pubreg import PubsCommand
+from okdata.cli.commands.pubs import PubsCommand
 from okdata.cli.commands.status import StatusCommand
 from okdata.cli.commands.teams.teams import TeamsCommand
 

okdata/cli/commands/pubs/__init__.py

@@ -0,0 +1,3 @@
+from okdata.cli.commands.pubs.pubs import PubsCommand
+
+__all__ = ["PubsCommand"]

okdata/cli/commands/pubreg/pubreg.py → okdata/cli/commands/pubs/pubs.py

@@ -6,14 +6,14 @@
 
 from okdata.cli import MAINTAINER
 from okdata.cli.command import BASE_COMMAND_OPTIONS, BaseCommand
-from okdata.cli.commands.pubreg.client import PubsClient
-from okdata.cli.commands.pubreg.questions import (
+from okdata.cli.commands.pubs.client import PubsClient
+from okdata.cli.commands.pubs.questions import (
     NoClientsError,
     NoKeysError,
     client_types,
     providers,
 )
-from okdata.cli.commands.pubreg.wizards import (
+from okdata.cli.commands.pubs.wizards import (
     audit_log_wizard,
     create_client_wizard,
     create_key_wizard,
@@ -125,7 +125,7 @@ def list_clients(self):
         config = list_clients_wizard()
         env = config["env"]
         clients = self.pubs_client.get_clients(env)
-        out = create_output(self.opt("format"), "pubreg_clients_config.json")
+        out = create_output(self.opt("format"), "pubs_clients_config.json")
         out.add_rows(sorted(clients, key=itemgetter("client_name")))
         self.print(f"Clients in {env}:", out)
 
@@ -285,7 +285,7 @@ def _list_client_keys_single(self, client_id, client_name, env):
         keys = self.pubs_client.get_keys(env, client_id)
         out = create_output(
             self.opt("format"),
-            "pubreg_single_client_keys_config.json",
+            "pubs_single_client_keys_config.json",
         )
         out.add_rows(sorted(keys, key=itemgetter("expires")))
         self.print(f"Keys for client {client_name} [{env}]:", out)
@@ -299,7 +299,7 @@ def _list_client_keys_multiple(self, clients, env):
         ]
         out = create_output(
             self.opt("format"),
-            "pubreg_multiple_client_keys_config.json",
+            "pubs_multiple_client_keys_config.json",
         )
         out.add_rows(sorted(keys, key=itemgetter("expires")))
         self.print(f"All client keys [{env}]:", out)
@@ -343,6 +343,6 @@ def audit_log(self):
 
         audit_log = self.pubs_client.get_audit_log(env, client_id)
 
-        out = create_output(self.opt("format"), "pubreg_audit_log_config.json")
+        out = create_output(self.opt("format"), "pubs_audit_log_config.json")
         out.add_rows(sorted(audit_log, key=itemgetter("timestamp")))
         self.print(f"Audit log for client {client_name} [{env}]:", out)

okdata/cli/commands/pubreg/wizards.py → okdata/cli/commands/pubs/wizards.py

@@ -1,4 +1,4 @@
-from okdata.cli.commands.pubreg.questions import (
+from okdata.cli.commands.pubs.questions import (
     q_aws_account,
     q_aws_region,
     q_client,