fix tests

cloudtruth · Sep 22, 2021 · 3246b96 · 3246b96
1 parent 8cca242
commit 3246b96
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 106 deletions.
diff --git a/lib/kubetruth/config.rb b/lib/kubetruth/config.rb
@@ -50,6 +50,7 @@ def convert_types(hash)
       key_selector: '',
       environment: 'default',
       skip: false,
+      log_level: nil,
       included_projects: [],
       context: {},
       resource_templates: []

diff --git a/spec/fixtures/vcr/Kubetruth_KubeApi/custom_resource/can_get_project_mappings.yml b/spec/fixtures/vcr/Kubetruth_KubeApi/custom_resource/can_get_project_mappings.yml
diff --git a/spec/kubetruth/ctapi_spec.rb b/spec/kubetruth/ctapi_spec.rb
@@ -13,7 +13,7 @@ module Kubetruth
       # Spin up a local dev server and create a user with an api key to use
       # here, or use cloudtruth actual
       key = ENV['CLOUDTRUTH_API_KEY']
-      url = ENV['CLOUDTRUTH_API_URL'] || "https://localhost:8000"
+      url = ENV['CLOUDTRUTH_API_URL'] || "https://api.cloudtruth.io" # "https://localhost:8000"
       instance = ::Kubetruth::CtApi.new(api_key: key, api_url: url)
       instance.client.config.debugging = false # ssl debug logging is messy, so only turn this on as desired
       instance.client.config.ssl_verify = false

diff --git a/spec/kubetruth/etl_spec.rb b/spec/kubetruth/etl_spec.rb
@@ -329,10 +329,7 @@ class ForceExit < Exception; end
     describe "#apply" do
 
       let(:collection) { ProjectCollection.new }
-      let(:root_spec_crd) {
-        default_root_spec = YAML.load_file(File.expand_path("../../helm/kubetruth/values.yaml", __dir__)).deep_symbolize_keys
-        default_root_spec[:projectMappings][:root]
-      }
+      let(:root_spec_crd) { default_root_spec }
       let(:config) {
         Kubetruth::Config.new([root_spec_crd])
       }

diff --git a/spec/kubetruth/kubeapi_spec.rb b/spec/kubetruth/kubeapi_spec.rb
@@ -384,7 +384,7 @@ def apiserver; "https://127.0.0.1"; end
         expect(crds.keys.first).to eq(kubeapi.namespace)
         expect(crds.values.first).to match(hash_including("#{helm_name}-root"))
         expect(crds.values.first["#{helm_name}-root"][:name]).to eq("#{helm_name}-root")
-        expect(crds.values.first["#{helm_name}-root"].keys.sort).to eq(Kubetruth::Config::ProjectSpec.new.to_h.keys.sort)
+        expect(crds.values.first["#{helm_name}-root"].keys.sort).to eq((default_root_spec.keys << :name).sort)
       end
 
       it "can watch project mappings" do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -35,6 +35,11 @@ def fixture_dir
   @fixture_dir ||= File.expand_path("../fixtures", __FILE__)
 end
 
+def default_root_spec
+  default_root_spec = YAML.load_file(File.expand_path("../helm/kubetruth/values.yaml", __dir__)).deep_symbolize_keys
+  default_root_spec[:projectMappings][:root]
+end
+
 def logger
   ::Logging.logger.root
 end