helper improve code reuse

BrunoReboul · Mar 27, 2020 · 435aaa4 · 435aaa4
1 parent 26bcadd
commit 435aaa4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 38 deletions.
diff --git a/listgroups/listgroups.go b/listgroups/listgroups.go
@@ -80,15 +80,10 @@ type Key struct {
 
 // FeedMessage Cloud Asset Inventory feed message
 type FeedMessage struct {
-	Asset   Asset  `json:"asset"`
-	Window  Window `json:"window"`
-	Deleted bool   `json:"deleted"`
-	Origin  string `json:"origin"`
-}
-
-// Window Cloud Asset Inventory feed message time window
-type Window struct {
-	StartTime time.Time `json:"startTime"`
+	Asset   Asset         `json:"asset"`
+	Window  helper.Window `json:"window"`
+	Deleted bool          `json:"deleted"`
+	Origin  string        `json:"origin"`
 }
 
 // Asset uses the new CAI feed format
@@ -101,11 +96,6 @@ type Asset struct {
 	Resource     *admin.Group    `json:"resource"`
 }
 
-// PublishRequest Pub/sub
-type PublishRequest struct {
-	Topic string `json:"topic"`
-}
-
 // Settings from PubSub triggering event
 type Settings struct {
 	Domain      string `json:"domain"`

diff --git a/stream2bq/stream2bq.go b/stream2bq/stream2bq.go
@@ -148,16 +148,16 @@ type SpecBQ struct {
 
 // FeedMessage Cloud Asset Inventory feed message
 type FeedMessage struct {
-	Asset  Asset  `json:"asset"`
-	Window Window `json:"window"`
-	Origin string `json:"origin"`
+	Asset  Asset         `json:"asset"`
+	Window helper.Window `json:"window"`
+	Origin string        `json:"origin"`
 }
 
 // FeedMessageBQ format to persist in BQ
 type FeedMessageBQ struct {
-	Asset  AssetBQ `json:"asset"`
-	Window Window  `json:"window"`
-	Origin string  `json:"origin"`
+	Asset  AssetBQ       `json:"asset"`
+	Window helper.Window `json:"window"`
+	Origin string        `json:"origin"`
 }
 
 // Asset Cloud Asset Metadata
@@ -190,10 +190,10 @@ type AssetBQ struct {
 
 // AssetFeedMessageBQ Cloud Asset Inventory feed message for asset table
 type AssetFeedMessageBQ struct {
-	Asset   AssetAssetBQ `json:"asset"`
-	Window  Window       `json:"window"`
-	Deleted bool         `json:"deleted"`
-	Origin  string       `json:"origin"`
+	Asset   AssetAssetBQ  `json:"asset"`
+	Window  helper.Window `json:"window"`
+	Deleted bool          `json:"deleted"`
+	Origin  string        `json:"origin"`
 }
 
 // AssetAssetBQ format to persist asset in BQ assets table
@@ -210,11 +210,6 @@ type AssetAssetBQ struct {
 	Timestamp               time.Time `json:"timestamp"`
 }
 
-// Window Cloud Asset Inventory feed message time window
-type Window struct {
-	StartTime time.Time `json:"startTime"`
-}
-
 // Parameters Constraint's settings
 type Parameters map[string]json.RawMessage
 

diff --git a/upload2gcs/upload2gcs.go b/upload2gcs/upload2gcs.go
@@ -53,15 +53,10 @@ type Global struct {
 
 // FeedMessage Cloud Asset Inventory feed message
 type FeedMessage struct {
-	Asset   Asset  `json:"asset"`
-	Window  Window `json:"window"`
-	Deleted bool   `json:"deleted"`
-	Origin  string `json:"origin"`
-}
-
-// Window Cloud Asset Inventory feed message time window
-type Window struct {
-	StartTime time.Time `json:"startTime"`
+	Asset   Asset         `json:"asset"`
+	Window  helper.Window `json:"window"`
+	Deleted bool          `json:"deleted"`
+	Origin  string        `json:"origin"`
 }
 
 // Asset Cloud Asset Metadata