ccli 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b808de24e75aa7de88a4fa899401f33b0c07a8bfc056371b6b4dba3037ac4c1c
-  data.tar.gz: 8d6aed4c6a3ddd82c0a9d5d2eaa26d5668b5da7d8ae6b3a1d7bfac473c724158
+  metadata.gz: d2f2f0b3d9151f52f911b794e164119054e2d281d3291f06a8e04b3ada1382d0
+  data.tar.gz: 5fef82bab17bf44d9b922c8ef543c89405e8aee145cf98c138c932d42c37bb4a
 SHA512:
-  metadata.gz: 23cdaf53c3e84c90ea7bd8caac55c1c0dc5479e70dbd7d893d31e4c9ef7830cda495f90d5d075c0cce93d242abad23b639c69f337df557b060219d633d8c373a
-  data.tar.gz: eb84e14c287080cecf3b91e08ef7837c1a7e64e923f9e505974f9fc28f5c95fbf0fcc14777663967f8f553cf9c5f39db52fb8094ca5b20207a4d2db105199e2a
+  metadata.gz: 10b197547309059384bb1fdd65135f5950cbf33cbbb9aed7fb5e871cb436cb493ef8524902e31318dbabd4fd1a98d26a4f769937845e97eb72e5a6c65ad43093
+  data.tar.gz: 6ef9539d2512c4ec66ae63d5eb400bc06fd1d8c33147304dffb2f2527ed3f74ba9e7e64b7b85f2da88806bef4f9be18c41ffd73ebe6cfb3ab04a92be4902fbfa

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.1.0
+
+- Rename Account to Encryptable to support Cryptopus > 4.2
+
 ## 1.0.1
 
 - Reset api user token after login

data/Gemfile

@@ -5,9 +5,9 @@ source 'https://rubygems.org'
 gem 'commander', '~> 4.5', '>= 4.5.2'
 gem 'rspec', '~> 3.9'
 gem 'rubocop', '~> 0.89.0'
-gem 'tty-command'
-gem 'tty-exit'
-gem 'tty-logger'
+gem 'tty-command', '~> 0.10'
+gem 'tty-exit', '~> 0.1'
+gem 'tty-logger', '~> 0.6'
 
 gem 'pry'
 gem 'pry-byebug'

data/Gemfile.lock

@@ -7,14 +7,12 @@ GEM
     commander (4.5.2)
       highline (~> 2.0.0)
     diff-lcs (1.4.4)
-    equatable (0.6.1)
     highline (2.0.3)
     method_source (1.0.0)
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
-    pastel (0.7.4)
-      equatable (~> 0.6)
+    pastel (0.8.0)
       tty-color (~> 0.5)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -24,7 +22,7 @@ GEM
       pry (~> 0.13.0)
     rainbow (3.0.0)
     regexp_parser (1.7.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -50,12 +48,12 @@ GEM
     rubocop-ast (0.3.0)
       parser (>= 2.7.1.4)
     ruby-progressbar (1.10.1)
-    tty-color (0.5.2)
-    tty-command (0.9.0)
-      pastel (~> 0.7.0)
+    tty-color (0.6.0)
+    tty-command (0.10.1)
+      pastel (~> 0.8)
     tty-exit (0.1.0)
-    tty-logger (0.3.0)
-      pastel (~> 0.7.0)
+    tty-logger (0.6.0)
+      pastel (~> 0.8)
     unicode-display_width (1.7.0)
 
 PLATFORMS
@@ -67,9 +65,9 @@ DEPENDENCIES
   pry-byebug
   rspec (~> 3.9)
   rubocop (~> 0.89.0)
-  tty-command
-  tty-exit
-  tty-logger
+  tty-command (~> 0.10)
+  tty-exit (~> 0.1)
+  tty-logger (~> 0.6)
 
 BUNDLED WITH
    2.1.4

data/README.md

@@ -10,7 +10,7 @@ This will install the `cry` command including its dependencies
 
 ## Features
 
-- Fetch account data from Cryptopus
+- Fetch encryptable data from Cryptopus
 - List accessable teams in Cryptopus
 - Sync Openshift/Kubernetes Secrets to Cryptopus
 - Sync Secrets from Cryptopus to Openshift/Kubernetes
@@ -24,7 +24,7 @@ This will install the `cry` command including its dependencies
 ```
   Command:           Summary:
 
-  account            Fetches an account by the given id
+  encryptable            Fetches an encryptable by the given id
   folder             Selects the Cryptopus folder by id
   help               Display global or [command] help documentation
   k8s-secret-pull    Pulls secret from Kubectl to Cryptopus
@@ -53,15 +53,15 @@ Use the ccli login copy button from the UI or do it manually:
 
 #### Retrieving
 
-To retreive account data as yaml:
+To retreive encryptable data as yaml:
 
 ```
-cry account 42 > account.yaml
+cry encryptable 42 > encryptable.yaml
 ```
-Retreiving account's password and assign it to a variable:
+Retreiving encryptable's password and assign it to a variable:
 
 ```
-PASSWORD=$(cry account 42 --password)
+PASSWORD=$(cry encryptable 42 --password)
 ```
 
 #### Updating

data/ccli.gemspec

@@ -6,11 +6,11 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 Gem::Specification.new do |s|
   s.name          = 'ccli'
   s.description   = <<-EOF
-    CCLI is the Cryptopus Command Line Interface. It allows to fetch account data and list teams from Cryptopus.
+    CCLI is the Cryptopus Command Line Interface. It allows to fetch encryptable data and list teams from Cryptopus.
     One of the main functionality is backing up secrets from cluster services (currently: openshift, kubernetes)
     to Cryptopus and restoring them as well.
   EOF
-  s.version       = '1.0.1'
+  s.version       = '1.1.0'
   s.summary       = 'Command line client for the opensource password manager Cryptopus'
   s.license       = 'MIT'
   s.homepage      = 'https://github.com/puzzle/ccli'
@@ -30,8 +30,8 @@ Gem::Specification.new do |s|
   }
 
   s.add_runtime_dependency 'commander', '~> 4.5', '>= 4.5.2'
-  s.add_runtime_dependency 'tty-command'
-  s.add_runtime_dependency 'tty-exit'
-  s.add_runtime_dependency 'tty-logger'
+  s.add_runtime_dependency 'tty-command', '~> 0.10'
+  s.add_runtime_dependency 'tty-exit', '~> 0.1'
+  s.add_runtime_dependency 'tty-logger', '~> 0.6'
 
 end

data/lib/adapters/cryptopus_adapter.rb

@@ -34,24 +34,23 @@ class CryptopusAdapter
   end
 
   def save_secret(secret)
-    secret_account = secret.to_account
-    secret_account.folder = session_adapter.selected_folder.id
-
-    persisted_secret = Account.find_by_name_and_folder_id(secret.name,
-                                                          session_adapter.selected_folder.id)
+    secret_encryptable = secret.to_encryptable
+    secret_encryptable.folder = session_adapter.selected_folder.id
+    persisted_secret = Encryptable.find_by_name_and_folder_id(secret.name,
+                                                              session_adapter.selected_folder.id)
     if persisted_secret
-      patch("accounts/#{persisted_secret.id}", secret_account.to_json)
+      patch("encryptables/#{persisted_secret.id}", secret_encryptable.to_json)
     else
-      post('accounts', secret_account.to_json)
+      post('encryptables', secret_encryptable.to_json)
     end
   end
 
-  def find_account_by_name(name)
-    secret_account = Account.find_by_name_and_folder_id(name, session_adapter.selected_folder.id)
+  def find_encryptable_by_name(name)
+    secret_encryptable = Encryptable.find_by_name_and_folder_id(name, session_adapter.selected_folder.id)
 
-    raise CryptopusAccountNotFoundError unless secret_account
+    raise CryptopusEncryptableNotFoundError unless secret_encryptable
 
-    secret_account
+    secret_encryptable
   end
 
   def renewed_auth_token

data/lib/cli.rb

@@ -14,7 +14,7 @@ class CLI
   # rubocop:disable Metrics/MethodLength, Metrics/AbcSize, Metric/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/BlockLength
   def run
     program :name, 'cry - cryptopus cli'
-    program :version, '1.0.1'
+    program :version, '1.1.0'
     program :description, 'CLI tool to manage Openshift Secrets via Cryptopus'
     program :help, 'Source Code', 'https://www.github.com/puzzle/ccli'
     program :help, 'Usage', 'cry [flags]'
@@ -49,20 +49,20 @@ class CLI
       end
     end
 
-    command :account do |c|
-      c.syntax = 'cry account <id> [options]'
-      c.description = 'Fetches an account by the given id'
+    command :encryptable do |c|
+      c.syntax = 'cry encryptable <id> [options]'
+      c.description = 'Fetches an encryptable by the given id'
       c.option '--username', String, 'Only show the username of the user'
       c.option '--password', String, 'Only show the password of the user'
 
       c.action do |args, options|
         exit_with_error(:usage_error, 'id missing') if args.empty?
         execute_action do
-          logger.info 'Fetching account...'
-          account = Account.find(args.first)
-          out = account.username if options.username
-          out = account.password if options.password
-          puts out || account.to_yaml
+          logger.info 'Fetching encryptable...'
+          encryptable = Encryptable.find(args.first)
+          out = encryptable.username if options.username
+          out = encryptable.password if options.password
+          puts out || encryptable.to_yaml
         end
       end
     end
@@ -120,25 +120,25 @@ class CLI
       c.summary = 'Pushes secret from Cryptopus to Openshift'
       c.description = 'Pushes the Secret to Openshift by retrieving it from Cryptopus first. ' \
                       'If a Secret in the selected Openshift project using the name ' \
-                      'of the given accountname is already present, it will be updated accordingly.'
+                      'of the given name is already present, it will be updated accordingly.'
 
       c.action do |args|
         secret_name = args.first
         exit_with_error(:usage_error, 'Only one secret can be pushed') if args.length > 1
         execute_action({ secret_name: secret_name }) do
-          secret_accounts = if secret_name.nil?
-                              logger.info 'Fetching all accounts in folder...'
-                              session_adapter.selected_folder.accounts
+          secret_encryptables = if secret_name.nil?
+                              logger.info 'Fetching all encryptables in folder...'
+                              session_adapter.selected_folder.encryptables
                             else
-                              logger.info "Fetching account #{secret_name}..."
-                              [cryptopus_adapter.find_account_by_name(secret_name)]
+                              logger.info "Fetching encryptable #{secret_name}..."
+                              [cryptopus_adapter.find_encryptable_by_name(secret_name)]
                             end
-          secret_accounts.each do |account|
-            logger.info "Fetching secret #{account.accountname}..."
-            secret_account = Account.find(account.id)
-            logger.info "Inserting secret #{account.accountname}..."
-            ose_adapter.insert_secret(secret_account.to_osesecret)
-            log_success "Secret #{secret_account.accountname} was successfully applied"
+          secret_encryptables.each do |encryptable|
+            logger.info "Fetching secret #{encryptable.name}..."
+            secret_encryptable = Encryptable.find(encryptable.id)
+            logger.info "Inserting secret #{encryptable.name}..."
+            ose_adapter.insert_secret(secret_encryptable.to_osesecret)
+            log_success "Secret #{secret_encryptable.name} was successfully applied"
           end
         end
       end
@@ -148,7 +148,7 @@ class CLI
       c.syntax = 'cry k8s-secret-pull <secret-name>'
       c.summary = 'Pulls secret from Kubectl to Cryptopus'
       c.description = "Pulls the Secret from Kubectl and pushes them to Cryptopus.\n" \
-                      'If a Cryptopus Account in the selected folder using the name ' \
+                      'If a Cryptopus Encryptable in the selected folder using the name ' \
                       "of the given secret is already present, it will be updated accordingly.\n" \
                       'If no name is given, it will pull all secrets inside the selected project.'
 
@@ -180,25 +180,24 @@ class CLI
       c.summary = 'Pushes secret from Cryptopus to Kubectl'
       c.description = 'Pushes the Secret to Kubectl by retrieving it from Cryptopus first. ' \
                       'If a Secret in the selected Kubectl project using the name ' \
-                      'of the given accountname is already present, it will be updated accordingly.'
+                      'of the given name is already present, it will be updated accordingly.'
 
       c.action do |args|
         secret_name = args.first
         exit_with_error(:usage_error, 'Only one secret can be pushed') if args.length > 1
         execute_action({ secret_name: secret_name }) do
-          secret_accounts = if secret_name.nil?
-                              logger.info 'Fetching all accounts in folder...'
-                              session_adapter.selected_folder.accounts
+          secret_encryptables = if secret_name.nil?
+                              logger.info 'Fetching all encryptables in folder...'
+                              session_adapter.selected_folder.encryptables
                             else
-                              logger.info "Fetching account #{secret_name}..."
-                              [cryptopus_adapter.find_account_by_name(secret_name)]
+                              logger.info "Fetching encryptable #{secret_name}..."
+                              [cryptopus_adapter.find_encryptable_by_name(secret_name)]
                             end
-          secret_accounts.each do |account|
-            logger.info "Fetching secret #{account.accountname}..."
-            secret_account = Account.find(account.id)
-            logger.info "Inserting secret #{account.accountname}..."
-            k8s_adapter.insert_secret(secret_account.to_osesecret)
-            log_success "Secret #{secret_account.accountname} was successfully applied"
+          secret_encryptables.each do |encryptable|
+            secret_encryptable = Encryptable.find(encryptable.id)
+            logger.info "Inserting secret #{encryptable.name}..."
+            k8s_adapter.insert_secret(secret_encryptable.to_osesecret)
+            log_success "Secret #{secret_encryptable.name} was successfully applied"
           end
         end
       end
@@ -264,7 +263,7 @@ class CLI
     exit_with_error(:usage_error, 'kubectl is not installed')
   rescue KubernetesClientNotLoggedInError
     exit_with_error(:usage_error, 'kubectl is not logged in')
-  rescue CryptopusAccountNotFoundError
+  rescue CryptopusEncryptableNotFoundError
     exit_with_error(:usage_error, 'Secret with the given name ' \
                                   "#{options[:secret_name]} was not found")
   rescue OpenshiftSecretNotFoundError

data/lib/errors.rb

@@ -30,7 +30,7 @@ end
 class NoFolderSelectedError < Error
 end
 
-class CryptopusAccountNotFoundError < Error
+class CryptopusEncryptableNotFoundError < Error
 end
 
 class TeamNotFoundError < Error

data/lib/models/encryptable.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class Encryptable
+  attr_reader :id, :name, :username, :password, :type, :ose_secret
+  attr_accessor :folder
+
+  def initialize(name: nil, username: nil, password: nil,
+                 ose_secret: nil, type: nil, id: nil)
+    @id = id
+    @name = name
+    @username = username
+    @password = password
+    @ose_secret = ose_secret
+    @type = type || 'credentials'
+  end
+
+  def to_json(*_args)
+    EncryptableSerializer.to_json(self)
+  end
+
+  def to_yaml
+    EncryptableSerializer.to_yaml(self)
+  end
+
+  def to_osesecret
+    EncryptableSerializer.to_osesecret(self)
+  end
+
+  class << self
+    def find(id)
+      EncryptableSerializer.from_json(CryptopusAdapter.new.get("encryptables/#{id}"))
+    end
+
+    def find_by_name_and_folder_id(name, id)
+      Folder.find(id).encryptables.find do |encryptable|
+        encryptable.name.downcase == name.downcase
+      end
+    end
+
+    def from_json(json)
+      EncryptableSerializer.from_json(json)
+    end
+  end
+end

data/lib/models/folder.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 class Folder
-  attr_reader :name, :id, :accounts
+  attr_reader :name, :id, :encryptables
 
-  def initialize(name: nil, id: nil, accounts: [])
+  def initialize(name: nil, id: nil, encryptables: [])
     @name = name
     @id = id
-    @accounts = accounts
+    @encryptables = encryptables
   end
 
   class << self
@@ -15,11 +15,11 @@ class Folder
                         symbolize_names: true)
       included = json[:included] || []
       name = json[:data][:attributes][:name]
-      accounts = included.map do |record|
-        Account.from_json(record.to_json) if %w[account_ose_secrets
-                                                account_credentials].include? record[:type]
+      encryptables = included.map do |record|
+        Encryptable.from_json(record.to_json) if %w[encryptable_ose_secrets
+                                                encryptable_credentials].include? record[:type]
       end.compact
-      Folder.new(id: id, name: name, accounts: accounts)
+      Folder.new(id: id, name: name, encryptables: encryptables)
     end
   end
 end

data/lib/models/ose_secret.rb

@@ -8,8 +8,8 @@ class OSESecret
     @ose_secret = ose_secret
   end
 
-  def to_account
-    OSESecretSerializer.to_account(self)
+  def to_encryptable
+    OSESecretSerializer.to_encryptable(self)
   end
 
   def to_yaml

data/lib/serializers/encryptable_serializer.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+class EncryptableSerializer
+  class << self
+    # rubocop:disable Metrics/MethodLength
+    def to_json(encryptable)
+      {
+        data: {
+          type: 'encryptables',
+          id: encryptable.id,
+          attributes: {
+            name: encryptable.name,
+            type: encryptable.type,
+            cleartext_username: encryptable.username,
+            cleartext_password: encryptable.password,
+            cleartext_ose_secret: encryptable.ose_secret
+          },
+          relationships: {
+            folder: {
+              data: {
+                id: encryptable.folder,
+                type: 'folders'
+              }
+            }
+          }
+        }
+      }.compact.to_json
+    end
+    # rubocop:enable Metrics/MethodLength
+
+    def to_yaml(encryptable)
+      { 'id' => encryptable.id,
+        'name' => encryptable.name,
+        'username' => encryptable.username,
+        'password' => encryptable.password,
+        'type' => encryptable.type }.to_yaml
+    end
+
+    def from_json(json)
+      json = JSON.parse(json, symbolize_names: true)
+      data = json[:data] || json
+      attributes = data[:attributes]
+      Encryptable.new(name: attributes[:name],
+                      username: attributes[:cleartext_username],
+                      password: attributes[:cleartext_password],
+                      ose_secret: attributes[:ose_secret],
+                      type: attributes[:type],
+                      id: data[:id])
+    end
+
+    def to_osesecret(account)
+      OSESecret.from_yaml(account.ose_secret)
+    end
+  end
+end

data/lib/serializers/ose_secret_serializer.rb

@@ -21,8 +21,8 @@ class OSESecretSerializer
     end
     # rubocop:enable Metrics/MethodLength
 
-    def to_account(secret)
-      Account.new(accountname: secret.name, ose_secret: secret.ose_secret, type: 'ose_secret')
+    def to_encryptable(secret)
+      Encryptable.new(name: secret.name, ose_secret: secret.ose_secret, type: 'ose_secret')
     end
 
     def to_yaml(secret)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ccli
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Nils Rauch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-05 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -34,46 +34,46 @@ dependencies:
   name: tty-command
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: tty-exit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: tty-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
 description: |2
-      CCLI is the Cryptopus Command Line Interface. It allows to fetch account data and list teams from Cryptopus.
+      CCLI is the Cryptopus Command Line Interface. It allows to fetch encryptable data and list teams from Cryptopus.
       One of the main functionality is backing up secrets from cluster services (currently: openshift, kubernetes)
       to Cryptopus and restoring them as well.
 email: rauch@puzzle.ch
@@ -101,13 +101,13 @@ files:
 - lib/adapters/session_adapter.rb
 - lib/cli.rb
 - lib/errors.rb
-- lib/models/account.rb
+- lib/models/encryptable.rb
 - lib/models/folder.rb
 - lib/models/k8s_secret.rb
 - lib/models/ose_secret.rb
 - lib/models/team.rb
 - lib/presenters/team_presenter.rb
-- lib/serializers/account_serializer.rb
+- lib/serializers/encryptable_serializer.rb
 - lib/serializers/folder_serializer.rb
 - lib/serializers/ose_secret_serializer.rb
 - lib/serializers/team_serializer.rb

data/lib/models/account.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-class Account
-  attr_reader :id, :accountname, :username, :password, :type, :ose_secret
-  attr_accessor :folder
-
-  def initialize(accountname: nil, username: nil, password: nil,
-                 ose_secret: nil, type: nil, id: nil)
-    @id = id
-    @accountname = accountname
-    @username = username
-    @password = password
-    @ose_secret = ose_secret
-    @type = type || 'credentials'
-  end
-
-  def to_json(*_args)
-    AccountSerializer.to_json(self)
-  end
-
-  def to_yaml
-    AccountSerializer.to_yaml(self)
-  end
-
-  def to_osesecret
-    AccountSerializer.to_osesecret(self)
-  end
-
-  class << self
-    def find(id)
-      AccountSerializer.from_json(CryptopusAdapter.new.get("accounts/#{id}"))
-    end
-
-    def find_by_name_and_folder_id(name, id)
-      Folder.find(id).accounts.find do |account|
-        account.accountname.downcase == name.downcase
-      end
-    end
-
-    def from_json(json)
-      AccountSerializer.from_json(json)
-    end
-  end
-end

data/lib/serializers/account_serializer.rb

@@ -1,57 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-class AccountSerializer
-  class << self
-    # rubocop:disable Metrics/MethodLength
-    def to_json(account)
-      {
-        data: {
-          type: 'accounts',
-          id: account.id,
-          attributes: {
-            accountname: account.accountname,
-            type: account.type,
-            cleartext_username: account.username,
-            cleartext_password: account.password,
-            ose_secret: account.ose_secret
-          },
-          relationships: {
-            folder: {
-              data: {
-                id: account.folder,
-                type: 'folders'
-              }
-            }
-          }
-        }
-      }.compact.to_json
-    end
-    # rubocop:enable Metrics/MethodLength
-
-    def to_yaml(account)
-      { 'id' => account.id,
-        'accountname' => account.accountname,
-        'username' => account.username,
-        'password' => account.password,
-        'type' => account.type }.to_yaml
-    end
-
-    def from_json(json)
-      json = JSON.parse(json, symbolize_names: true)
-      data = json[:data] || json
-      attributes = data[:attributes]
-      Account.new(accountname: attributes[:accountname],
-                  username: attributes[:cleartext_username],
-                  password: attributes[:cleartext_password],
-                  ose_secret: attributes[:ose_secret],
-                  type: attributes[:type],
-                  id: data[:id])
-    end
-
-    def to_osesecret(account)
-      OSESecret.from_yaml(account.ose_secret)
-    end
-  end
-end