feat(amp): added prometheusservice amp workspace, rebased and added t…

…agger Signed-off-by: haarchri <chhaar30@googlemail.com>
crossplane-contrib · Mar 7, 2022 · 2ede9e8 · 2ede9e8
1 parent 9157f09
commit 2ede9e8
Show file tree

Hide file tree

Showing 11 changed files with 271 additions and 11 deletions.
diff --git a/...eusservice/v1alpha1/generator-config.yaml → apis/prometheusservice/generator-config.yaml b/...eusservice/v1alpha1/generator-config.yaml → apis/prometheusservice/generator-config.yaml
@@ -2,6 +2,9 @@ model_name: amp
 ignore:
   field_paths:
     - CreateWorkspaceInput.ClientToken
+  resource_names:
+    - AlertManagerDefinition
+    - RuleGroupsNamespace
 resources:
   Workspace:
     fields:

diff --git a/apis/prometheusservice/v1alpha1/zz_enums.go b/apis/prometheusservice/v1alpha1/zz_enums.go
diff --git a/apis/prometheusservice/v1alpha1/zz_generated.deepcopy.go b/apis/prometheusservice/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/prometheusservice/v1alpha1/zz_groupversion_info.go b/apis/prometheusservice/v1alpha1/zz_groupversion_info.go
diff --git a/apis/prometheusservice/v1alpha1/zz_types.go b/apis/prometheusservice/v1alpha1/zz_types.go
diff --git a/apis/prometheusservice/v1alpha1/zz_workspace.go b/apis/prometheusservice/v1alpha1/zz_workspace.go
diff --git a/package/crds/prometheusservice.aws.crossplane.io_workspaces.yaml b/package/crds/prometheusservice.aws.crossplane.io_workspaces.yaml
@@ -67,6 +67,11 @@ spec:
                   region:
                     description: Region is which region the Workspace will be created.
                     type: string
+                  tags:
+                    additionalProperties:
+                      type: string
+                    description: Optional, user-provided tags for this workspace.
+                    type: object
                 required:
                 - region
                 type: object

diff --git a/pkg/controller/aws.go b/pkg/controller/aws.go
@@ -118,15 +118,10 @@ import (
 	"github.com/crossplane/provider-aws/pkg/controller/lambda/function"
 	mqbroker "github.com/crossplane/provider-aws/pkg/controller/mq/broker"
 	mquser "github.com/crossplane/provider-aws/pkg/controller/mq/user"
-<<<<<<< HEAD
 	neptunecluster "github.com/crossplane/provider-aws/pkg/controller/neptune/dbcluster"
 	notsubscription "github.com/crossplane/provider-aws/pkg/controller/notification/snssubscription"
 	nottopic "github.com/crossplane/provider-aws/pkg/controller/notification/snstopic"
-=======
-	"github.com/crossplane/provider-aws/pkg/controller/notification/snssubscription"
-	"github.com/crossplane/provider-aws/pkg/controller/notification/snstopic"
 	prometheusserviceworkspace "github.com/crossplane/provider-aws/pkg/controller/prometheusservice/workspace"
->>>>>>> da23af59 (feat(amp): added prometheusservice amp workspace)
 	resourceshare "github.com/crossplane/provider-aws/pkg/controller/ram/resourceshare"
 	"github.com/crossplane/provider-aws/pkg/controller/rds/dbcluster"
 	"github.com/crossplane/provider-aws/pkg/controller/rds/dbclusterparametergroup"