Merge pull request #296 from grosser/grosser/team

make team tags use - instead of _ to be url compatible
grosser · Aug 27, 2023 · 3933dee · 3933dee
2 parents 4abbcbd + 0964098
commit 3933dee
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 11 deletions.
diff --git a/Readme.md b/Readme.md
@@ -430,7 +430,7 @@ rake plan
 
 Then make changes to play around, do not commit changes and make sure to revert with a `rake kennel:update_datadog` after deleting everything.
 
-To make changes via the UI, make a new free datadog account and use it's credentaisl instead.
+To make changes via the UI, make a new free datadog account and use it's credentials instead.
 
 Author
 ======

diff --git a/lib/kennel/models/team.rb b/lib/kennel/models/team.rb
@@ -4,7 +4,7 @@ module Models
     class Team < Base
       settings :mention, :tags, :renotify_interval, :kennel_id
       defaults(
-        tags: -> { ["team:#{kennel_id.sub(/^teams_/, "")}"] },
+        tags: -> { ["team:#{kennel_id.sub(/^teams_/, "").tr("_", "-")}"] },
         renotify_interval: -> { 0 }
       )
     end

diff --git a/test/kennel/models/dashboard_test.rb b/test/kennel/models/dashboard_test.rb
@@ -24,7 +24,7 @@ def dashboard(extra = {})
       template_variable_presets: nil,
       widgets: [],
       reflow_type: "auto",
-      tags: ["team:test_team"]
+      tags: ["team:test-team"]
     }
   end
   let(:dashboard_with_requests) do

diff --git a/test/kennel/models/monitor_test.rb b/test/kennel/models/monitor_test.rb
@@ -29,7 +29,7 @@ def monitor(options = {})
       type: "query alert",
       query: +"avg(last_5m) > 123.0",
       message: "@slack-foo",
-      tags: ["team:test_team"],
+      tags: ["team:test-team"],
       priority: nil,
       options: {
         timeout_h: 0,

diff --git a/test/kennel/models/project_test.rb b/test/kennel/models/project_test.rb
@@ -54,7 +54,7 @@ def self.to_s
 
   describe "#tags" do
     it "uses team" do
-      TestProject.new.tags.must_equal ["team:test_team"]
+      TestProject.new.tags.must_equal ["team:test-team"]
     end
   end
 

diff --git a/test/kennel/models/slo_test.rb b/test/kennel/models/slo_test.rb
@@ -28,7 +28,7 @@ def slo(options = {})
       description: nil,
       thresholds: [],
       monitor_ids: [],
-      tags: ["team:test_team"],
+      tags: ["team:test-team"],
       type: "metric"
     }
   end

diff --git a/test/kennel/models/synthetic_test_test.rb b/test/kennel/models/synthetic_test_test.rb
@@ -30,7 +30,7 @@ def synthetic(options = {})
     {
       message: "hey",
       tags: [
-        "team:test_team"
+        "team:test-team"
       ],
       config: {},
       type: "api",

diff --git a/test/kennel/models/team_test.rb b/test/kennel/models/team_test.rb
@@ -8,11 +8,11 @@
 
   describe "#tags" do
     it "is a nice searchable name" do
-      TestTeam.new.tags.must_equal ["team:test_team"]
+      TestTeam.new.tags.must_equal ["team:test-team"]
     end
 
     it "does not prefix teams with folder name if it is teams too" do
-      Teams::MyTeam.new.tags.must_equal ["team:my_team"]
+      Teams::MyTeam.new.tags.must_equal ["team:my-team"]
     end
   end
 

diff --git a/test/kennel/syncer_test.rb b/test/kennel/syncer_test.rb
@@ -22,7 +22,7 @@ def tagged(api_resource, hash)
 
   def monitor_api_response(pid, cid, extra = {})
     tagged("monitor", {
-      tags: extra.delete(:tags) || ["team:test_team"],
+      tags: extra.delete(:tags) || ["team:test-team"],
       message: "@slack-foo\n-- Managed by kennel #{pid}:#{cid} in test/test_helper.rb, do not modify manually",
       options: {}
     }.merge(extra))
@@ -378,7 +378,7 @@ def change(*args)
           name: "x\u{1F512}",
           type: "metric",
           thresholds: [],
-          tags: ["team:test_team"],
+          tags: ["team:test-team"],
           description: "x\n-- Managed by kennel a:b in test/test_helper.rb, do not modify manually"
         })
       end