feat(notifications): Add tags git ref type to notification filters

notifications/Makefile

@@ -4,7 +4,7 @@ include ../Makefile
 
 APP_NAME=$(shell grep 'app:' mix.exs | cut -d ':' -f3 | cut -d ',' -f1)
 PROTOC_TAG=1.12.1-3.17.3-0.7.1
-TMP_REPO_DIR=/tmp/internal_api
+TMP_REPO_DIR ?= /tmp/internal_api
 
 INTERNAL_API_BRANCH ?= master
 PUBLIC_API_BRANCH ?= master

notifications/lib/internal_api/notifications.pb.ex

@@ -65,10 +65,11 @@ defmodule InternalApi.Notifications.Notification.Rule.Filter do
           pipelines: [String.t()],
           blocks: [String.t()],
           states: [[InternalApi.Notifications.Notification.Rule.Filter.State.t()]],
-          results: [[InternalApi.Notifications.Notification.Rule.Filter.Results.t()]]
+          results: [[InternalApi.Notifications.Notification.Rule.Filter.Results.t()]],
+          tags: [String.t()]
         }
 
-  defstruct [:projects, :branches, :pipelines, :blocks, :states, :results]
+  defstruct [:projects, :branches, :pipelines, :blocks, :states, :results, :tags]
 
   field(:projects, 1, repeated: true, type: :string)
   field(:branches, 2, repeated: true, type: :string)
@@ -86,6 +87,8 @@ defmodule InternalApi.Notifications.Notification.Rule.Filter do
     type: InternalApi.Notifications.Notification.Rule.Filter.Results,
     enum: true
   )
+
+  field(:tags, 7, repeated: true, type: :string)
 end
 
 defmodule InternalApi.Notifications.Notification.Rule.Notify.Slack do
@@ -224,10 +227,11 @@ defmodule InternalApi.Notifications.Notification do
           update_time: Google.Protobuf.Timestamp.t() | nil,
           rules: [InternalApi.Notifications.Notification.Rule.t()],
           status: InternalApi.Notifications.Notification.Status.t() | nil,
-          org_id: String.t()
+          org_id: String.t(),
+          creator_id: String.t()
         }
 
-  defstruct [:name, :id, :create_time, :update_time, :rules, :status, :org_id]
+  defstruct [:name, :id, :create_time, :update_time, :rules, :status, :org_id, :creator_id]
 
   field(:name, 1, type: :string)
   field(:id, 2, type: :string)
@@ -236,6 +240,7 @@ defmodule InternalApi.Notifications.Notification do
   field(:rules, 5, repeated: true, type: InternalApi.Notifications.Notification.Rule)
   field(:status, 6, type: InternalApi.Notifications.Notification.Status)
   field(:org_id, 7, type: :string)
+  field(:creator_id, 8, type: :string)
 end
 
 defmodule InternalApi.Notifications.ListRequest do

notifications/lib/internal_api/organization.pb.ex

@@ -32,38 +32,6 @@ defmodule InternalApi.Organization.Member.Role do
   field(:ADMIN, 2)
 end
 
-defmodule InternalApi.Organization.Quota.Type do
-  @moduledoc false
-  use Protobuf, enum: true, syntax: :proto3
-
-  @type t ::
-          integer
-          | :MAX_PEOPLE_IN_ORG
-          | :MAX_PARALELLISM_IN_ORG
-          | :MAX_PROJECTS_IN_ORG
-          | :MAX_PARALLEL_E1_STANDARD_2
-          | :MAX_PARALLEL_E1_STANDARD_4
-          | :MAX_PARALLEL_E1_STANDARD_8
-          | :MAX_PARALLEL_A1_STANDARD_4
-          | :MAX_PARALLEL_A1_STANDARD_8
-
-  field(:MAX_PEOPLE_IN_ORG, 0)
-
-  field(:MAX_PARALELLISM_IN_ORG, 1)
-
-  field(:MAX_PROJECTS_IN_ORG, 7)
-
-  field(:MAX_PARALLEL_E1_STANDARD_2, 2)
-
-  field(:MAX_PARALLEL_E1_STANDARD_4, 3)
-
-  field(:MAX_PARALLEL_E1_STANDARD_8, 4)
-
-  field(:MAX_PARALLEL_A1_STANDARD_4, 5)
-
-  field(:MAX_PARALLEL_A1_STANDARD_8, 6)
-end
-
 defmodule InternalApi.Organization.OrganizationContact.ContactType do
   @moduledoc false
   use Protobuf, enum: true, syntax: :proto3
@@ -91,14 +59,16 @@ defmodule InternalApi.Organization.DescribeRequest do
   @type t :: %__MODULE__{
           org_id: String.t(),
           org_username: String.t(),
-          include_quotas: boolean
+          include_quotas: boolean,
+          soft_deleted: boolean
         }
 
-  defstruct [:org_id, :org_username, :include_quotas]
+  defstruct [:org_id, :org_username, :include_quotas, :soft_deleted]
 
   field(:org_id, 1, type: :string)
   field(:org_username, 2, type: :string)
   field(:include_quotas, 3, type: :bool)
+  field(:soft_deleted, 4, type: :bool)
 end
 
 defmodule InternalApi.Organization.DescribeResponse do
@@ -121,12 +91,14 @@ defmodule InternalApi.Organization.DescribeManyRequest do
   use Protobuf, syntax: :proto3
 
   @type t :: %__MODULE__{
-          org_ids: [String.t()]
+          org_ids: [String.t()],
+          soft_deleted: boolean
         }
 
-  defstruct [:org_ids]
+  defstruct [:org_ids, :soft_deleted]
 
   field(:org_ids, 1, repeated: true, type: :string)
+  field(:soft_deleted, 2, type: :bool)
 end
 
 defmodule InternalApi.Organization.DescribeManyResponse do
@@ -151,16 +123,18 @@ defmodule InternalApi.Organization.ListRequest do
           created_at_gt: Google.Protobuf.Timestamp.t() | nil,
           order: InternalApi.Organization.ListRequest.Order.t(),
           page_size: integer,
-          page_token: String.t()
+          page_token: String.t(),
+          soft_deleted: boolean
         }
 
-  defstruct [:user_id, :created_at_gt, :order, :page_size, :page_token]
+  defstruct [:user_id, :created_at_gt, :order, :page_size, :page_token, :soft_deleted]
 
   field(:user_id, 2, type: :string)
   field(:created_at_gt, 3, type: Google.Protobuf.Timestamp)
   field(:order, 4, type: InternalApi.Organization.ListRequest.Order, enum: true)
   field(:page_size, 5, type: :int32)
   field(:page_token, 6, type: :string)
+  field(:soft_deleted, 7, type: :bool)
 end
 
 defmodule InternalApi.Organization.ListResponse do
@@ -212,34 +186,6 @@ defmodule InternalApi.Organization.CreateResponse do
   field(:organization, 2, type: InternalApi.Organization.Organization)
 end
 
-defmodule InternalApi.Organization.CreateWithQuotasRequest do
-  @moduledoc false
-  use Protobuf, syntax: :proto3
-
-  @type t :: %__MODULE__{
-          organization: InternalApi.Organization.Organization.t() | nil,
-          quotas: [InternalApi.Organization.Quota.t()]
-        }
-
-  defstruct [:organization, :quotas]
-
-  field(:organization, 1, type: InternalApi.Organization.Organization)
-  field(:quotas, 2, repeated: true, type: InternalApi.Organization.Quota)
-end
-
-defmodule InternalApi.Organization.CreateWithQuotasResponse do
-  @moduledoc false
-  use Protobuf, syntax: :proto3
-
-  @type t :: %__MODULE__{
-          organization: InternalApi.Organization.Organization.t() | nil
-        }
-
-  defstruct [:organization]
-
-  field(:organization, 1, type: InternalApi.Organization.Organization)
-end
-
 defmodule InternalApi.Organization.UpdateRequest do
   @moduledoc false
   use Protobuf, syntax: :proto3
@@ -653,6 +599,19 @@ defmodule InternalApi.Organization.DestroyRequest do
   field(:org_id, 1, type: :string)
 end
 
+defmodule InternalApi.Organization.RestoreRequest do
+  @moduledoc false
+  use Protobuf, syntax: :proto3
+
+  @type t :: %__MODULE__{
+          org_id: String.t()
+        }
+
+  defstruct [:org_id]
+
+  field(:org_id, 1, type: :string)
+end
+
 defmodule InternalApi.Organization.Organization do
   @moduledoc false
   use Protobuf, syntax: :proto3
@@ -672,7 +631,6 @@ defmodule InternalApi.Organization.Organization do
           allowed_id_providers: [String.t()],
           deny_member_workflows: boolean,
           deny_non_member_workflows: boolean,
-          quotas: [InternalApi.Organization.Quota.t()],
           settings: [InternalApi.Organization.OrganizationSetting.t()]
         }
 
@@ -691,7 +649,6 @@ defmodule InternalApi.Organization.Organization do
     :allowed_id_providers,
     :deny_member_workflows,
     :deny_non_member_workflows,
-    :quotas,
     :settings
   ]
 
@@ -709,7 +666,6 @@ defmodule InternalApi.Organization.Organization do
   field(:allowed_id_providers, 13, repeated: true, type: :string)
   field(:deny_member_workflows, 14, type: :bool)
   field(:deny_non_member_workflows, 15, type: :bool)
-  field(:quotas, 8, repeated: true, type: InternalApi.Organization.Quota)
   field(:settings, 16, repeated: true, type: InternalApi.Organization.OrganizationSetting)
 end
 
@@ -768,21 +724,6 @@ defmodule InternalApi.Organization.Member do
   field(:github_uid, 8, type: :string)
 end
 
-defmodule InternalApi.Organization.Quota do
-  @moduledoc false
-  use Protobuf, syntax: :proto3
-
-  @type t :: %__MODULE__{
-          type: InternalApi.Organization.Quota.Type.t(),
-          value: non_neg_integer
-        }
-
-  defstruct [:type, :value]
-
-  field(:type, 1, type: InternalApi.Organization.Quota.Type, enum: true)
-  field(:value, 2, type: :uint32)
-end
-
 defmodule InternalApi.Organization.OrganizationSetting do
   @moduledoc false
   use Protobuf, syntax: :proto3
@@ -798,62 +739,6 @@ defmodule InternalApi.Organization.OrganizationSetting do
   field(:value, 2, type: :string)
 end
 
-defmodule InternalApi.Organization.GetQuotasRequest do
-  @moduledoc false
-  use Protobuf, syntax: :proto3
-
-  @type t :: %__MODULE__{
-          org_id: String.t(),
-          types: [[InternalApi.Organization.Quota.Type.t()]]
-        }
-
-  defstruct [:org_id, :types]
-
-  field(:org_id, 1, type: :string)
-  field(:types, 2, repeated: true, type: InternalApi.Organization.Quota.Type, enum: true)
-end
-
-defmodule InternalApi.Organization.GetQuotaResponse do
-  @moduledoc false
-  use Protobuf, syntax: :proto3
-
-  @type t :: %__MODULE__{
-          quotas: [InternalApi.Organization.Quota.t()]
-        }
-
-  defstruct [:quotas]
-
-  field(:quotas, 1, repeated: true, type: InternalApi.Organization.Quota)
-end
-
-defmodule InternalApi.Organization.UpdateQuotasRequest do
-  @moduledoc false
-  use Protobuf, syntax: :proto3
-
-  @type t :: %__MODULE__{
-          org_id: String.t(),
-          quotas: [InternalApi.Organization.Quota.t()]
-        }
-
-  defstruct [:org_id, :quotas]
-
-  field(:org_id, 1, type: :string)
-  field(:quotas, 2, repeated: true, type: InternalApi.Organization.Quota)
-end
-
-defmodule InternalApi.Organization.UpdateQuotasResponse do
-  @moduledoc false
-  use Protobuf, syntax: :proto3
-
-  @type t :: %__MODULE__{
-          quotas: [InternalApi.Organization.Quota.t()]
-        }
-
-  defstruct [:quotas]
-
-  field(:quotas, 1, repeated: true, type: InternalApi.Organization.Quota)
-end
-
 defmodule InternalApi.Organization.RepositoryIntegratorsRequest do
   @moduledoc false
   use Protobuf, syntax: :proto3
@@ -1172,6 +1057,21 @@ defmodule InternalApi.Organization.OrganizationDailyUpdate do
   field(:timestamp, 11, type: Google.Protobuf.Timestamp)
 end
 
+defmodule InternalApi.Organization.OrganizationRestored do
+  @moduledoc false
+  use Protobuf, syntax: :proto3
+
+  @type t :: %__MODULE__{
+          org_id: String.t(),
+          timestamp: Google.Protobuf.Timestamp.t() | nil
+        }
+
+  defstruct [:org_id, :timestamp]
+
+  field(:org_id, 1, type: :string)
+  field(:timestamp, 2, type: Google.Protobuf.Timestamp)
+end
+
 defmodule InternalApi.Organization.OrganizationService.Service do
   @moduledoc false
   use GRPC.Service, name: "InternalApi.Organization.OrganizationService"
@@ -1192,12 +1092,6 @@ defmodule InternalApi.Organization.OrganizationService.Service do
 
   rpc(:Create, InternalApi.Organization.CreateRequest, InternalApi.Organization.CreateResponse)
 
-  rpc(
-    :CreateWithQuotas,
-    InternalApi.Organization.CreateWithQuotasRequest,
-    InternalApi.Organization.CreateWithQuotasResponse
-  )
-
   rpc(:Update, InternalApi.Organization.UpdateRequest, InternalApi.Organization.UpdateResponse)
 
   rpc(:IsValid, InternalApi.Organization.Organization, InternalApi.Organization.IsValidResponse)
@@ -1254,20 +1148,10 @@ defmodule InternalApi.Organization.OrganizationService.Service do
     InternalApi.Organization.ListSuspensionsResponse
   )
 
-  rpc(
-    :UpdateQuotas,
-    InternalApi.Organization.UpdateQuotasRequest,
-    InternalApi.Organization.UpdateQuotasResponse
-  )
-
-  rpc(
-    :GetQuotas,
-    InternalApi.Organization.GetQuotasRequest,
-    InternalApi.Organization.GetQuotaResponse
-  )
-
   rpc(:Destroy, InternalApi.Organization.DestroyRequest, Google.Protobuf.Empty)
 
+  rpc(:Restore, InternalApi.Organization.RestoreRequest, Google.Protobuf.Empty)
+
   rpc(
     :RepositoryIntegrators,
     InternalApi.Organization.RepositoryIntegratorsRequest,