Merge pull request #1989 from opengovern/dev

Dev
opengovern · Nov 14, 2024 · c525234 · c525234
2 parents cab8926 + 2057539
commit c525234
Show file tree

Hide file tree

Showing 144 changed files with 433 additions and 307 deletions.
diff --git a/assets/dex-login/web/templates/login.html b/assets/dex-login/web/templates/login.html
@@ -2,37 +2,95 @@
 <div class="flex min-h-full flex-1 flex-col justify-center select-connector">
   <div class="sm:mx-auto sm:w-full sm:max-w-md connector-body">
     <div class="main-logo">
-     <svg width="360" height="180" viewBox="0 0 180 76" xmlns="http://www.w3.org/2000/svg">
-  <!-- Main Paths for Logo (Blue Shades) -->
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M78 69.9993H36.925C32.64 69.9993 28.68 67.8884 26.535 64.4566L26 63.602L25.465 62.7429C23.32 59.3157 19.36 57.2002 15.07 57.2002H0L8 44.4011H23.07C25.215 44.4011 27.275 44.9277 29.07 45.8838C30.865 46.8445 32.395 48.2302 33.465 49.9438L34 50.7984L34.535 51.6575C36.68 55.0893 40.64 57.2002 44.925 57.2002H70L74 63.602L78 69.9993Z" fill="url(#paint0_linear)"/>
-
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M77.9934 70L37.9985 6L30 18.8L61.9989 70H77.9934Z" fill="url(#paint1_linear)"/>
-
-  <path fill-rule="evenodd" clip-rule="evenodd" d="M45.9947 18.7991L41.9947 25.2009L37.9947 31.6028L33.9947 38L29.9947 44.4019L29.0697 45.8845C27.2747 44.9284 25.2147 44.4019 23.0697 44.4019H8.21973C11.7947 44.4019 15.0947 42.642 16.8797 39.7829L17.9947 38L21.9947 31.6028L25.9947 25.2009L29.9947 18.7991L33.9947 12.4018L37.9947 6L41.9947 12.4018L45.9947 18.7991Z" fill="url(#paint2_linear)"/>
+      <svg
+        width="360"
+        height="180"
+        viewBox="0 0 180 76"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <!-- Main Paths for Logo (Blue Shades) -->
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M78 69.9993H36.925C32.64 69.9993 28.68 67.8884 26.535 64.4566L26 63.602L25.465 62.7429C23.32 59.3157 19.36 57.2002 15.07 57.2002H0L8 44.4011H23.07C25.215 44.4011 27.275 44.9277 29.07 45.8838C30.865 46.8445 32.395 48.2302 33.465 49.9438L34 50.7984L34.535 51.6575C36.68 55.0893 40.64 57.2002 44.925 57.2002H70L74 63.602L78 69.9993Z"
+          fill="url(#paint0_linear)"
+        />
 
-  <!-- Text -->
-  <text x="90" y="40" font-family="Lato, sans-serif" font-size="24" letter-spacing="0.5" fill="#0D2239">open</text>
-  <text x="90" y="65" font-family="Lato, sans-serif" font-size="24" letter-spacing="0.5" fill="#0D2239">comply</text>
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M77.9934 70L37.9985 6L30 18.8L61.9989 70H77.9934Z"
+          fill="url(#paint1_linear)"
+        />
 
-  <!-- Gradients -->
-  <defs>
-    <linearGradient id="paint0_linear" x1="7800" y1="1483.58" x2="4042.37" y2="707.509" gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stop-color="#2563EA"/>
-      <stop offset="100%" stop-color="#014BFA"/>
-    </linearGradient>
-    <linearGradient id="paint1_linear" x1="1595.35" y1="6.00001" x2="2699.18" y2="3042.53" gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stop-color="#2563EA"/>
-      <stop offset="100%" stop-color="#014BFA"/>
-    </linearGradient>
-    <linearGradient id="paint2_linear" x1="3170.4" y1="4816.27" x2="3170.4" y2="6" gradientUnits="userSpaceOnUse">
-      <stop offset="0%" stop-color="#1C155C"/>
-      <stop offset="39.942%" stop-color="#014BFA"/>
-      <stop offset="99.99%" stop-color="#014BFA"/>
-      <stop offset="100%" stop-color="#FD7810"/>
-    </linearGradient>
-  </defs>
-</svg>
+        <path
+          fill-rule="evenodd"
+          clip-rule="evenodd"
+          d="M45.9947 18.7991L41.9947 25.2009L37.9947 31.6028L33.9947 38L29.9947 44.4019L29.0697 45.8845C27.2747 44.9284 25.2147 44.4019 23.0697 44.4019H8.21973C11.7947 44.4019 15.0947 42.642 16.8797 39.7829L17.9947 38L21.9947 31.6028L25.9947 25.2009L29.9947 18.7991L33.9947 12.4018L37.9947 6L41.9947 12.4018L45.9947 18.7991Z"
+          fill="url(#paint2_linear)"
+        />
 
+        <!-- Text -->
+        <text
+          x="90"
+          y="40"
+          font-family="Lato, sans-serif"
+          font-size="24"
+          letter-spacing="0.5"
+          fill="#0D2239"
+        >
+          open
+        </text>
+        <text
+          x="90"
+          y="65"
+          font-family="Lato, sans-serif"
+          font-size="24"
+          letter-spacing="0.5"
+          fill="#0D2239"
+        >
+          comply
+        </text>
+
+        <!-- Gradients -->
+        <defs>
+          <linearGradient
+            id="paint0_linear"
+            x1="7800"
+            y1="1483.58"
+            x2="4042.37"
+            y2="707.509"
+            gradientUnits="userSpaceOnUse"
+          >
+            <stop offset="0%" stop-color="#2563EA" />
+            <stop offset="100%" stop-color="#014BFA" />
+          </linearGradient>
+          <linearGradient
+            id="paint1_linear"
+            x1="1595.35"
+            y1="6.00001"
+            x2="2699.18"
+            y2="3042.53"
+            gradientUnits="userSpaceOnUse"
+          >
+            <stop offset="0%" stop-color="#2563EA" />
+            <stop offset="100%" stop-color="#014BFA" />
+          </linearGradient>
+          <linearGradient
+            id="paint2_linear"
+            x1="3170.4"
+            y1="4816.27"
+            x2="3170.4"
+            y2="6"
+            gradientUnits="userSpaceOnUse"
+          >
+            <stop offset="0%" stop-color="#1C155C" />
+            <stop offset="39.942%" stop-color="#014BFA" />
+            <stop offset="99.99%" stop-color="#014BFA" />
+            <stop offset="100%" stop-color="#FD7810" />
+          </linearGradient>
+        </defs>
+      </svg>
     </div>
     <div class="text">Welcome Back to Opengovernance.</div>
     <div class="connector-buttons">

diff --git a/cmd/auth-service/main.go b/cmd/auth-service/main.go
@@ -3,11 +3,11 @@ package main
 import (
 	"context"
 	"fmt"
-	"github.com/opengovern/opengovernance/pkg/auth"
 	"os"
 	"os/signal"
 	"syscall"
-
+
+	"github.com/opengovern/opengovernance/services/auth"
 )
 
 func main() {

diff --git a/cmd/compliance-report-worker/main.go b/cmd/compliance-report-worker/main.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/opengovern/opengovernance/pkg/compliance/runner"
+	"github.com/opengovern/opengovernance/services/compliance/runner"
 )
 
 func main() {

diff --git a/cmd/compliance-service/main.go b/cmd/compliance-service/main.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/opengovern/opengovernance/pkg/compliance"
+	"github.com/opengovern/opengovernance/services/compliance"
 )
 
 func main() {

diff --git a/cmd/compliance-summarizer/main.go b/cmd/compliance-summarizer/main.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/opengovern/opengovernance/pkg/compliance/summarizer"
+	"github.com/opengovern/opengovernance/services/compliance/summarizer"
 )
 
 func main() {

diff --git a/cmd/inventory-service/main.go b/cmd/inventory-service/main.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/opengovern/opengovernance/pkg/inventory"
+	"github.com/opengovern/opengovernance/services/inventory"
 )
 
 func main() {

diff --git a/cmd/metadata-service/main.go b/cmd/metadata-service/main.go
@@ -7,7 +7,7 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/opengovern/opengovernance/pkg/metadata"
+	"github.com/opengovern/opengovernance/services/metadata"
 )
 
 func main() {

diff --git a/cmd/query-runner-worker/main.go b/cmd/query-runner-worker/main.go
@@ -3,10 +3,11 @@ package main
 import (
 	"context"
 	"fmt"
-	queryrunner "github.com/opengovern/opengovernance/pkg/inventory/query-runner"
 	"os"
 	"os/signal"
 	"syscall"
+
+	queryrunner "github.com/opengovern/opengovernance/services/inventory/query-runner"
 )
 
 func main() {

diff --git a/pkg/analytics/command.go b/pkg/analytics/command.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+
 	esSinkClient "github.com/opengovern/og-util/pkg/es/ingest/client"
 	"github.com/opengovern/og-util/pkg/jq"
 	integrationClient "github.com/opengovern/opengovernance/services/integration/client"
@@ -17,7 +18,7 @@ import (
 	workerConfig "github.com/opengovern/opengovernance/pkg/analytics/config"
 	"github.com/opengovern/opengovernance/pkg/analytics/db"
 	describeClient "github.com/opengovern/opengovernance/pkg/describe/client"
-	inventoryClient "github.com/opengovern/opengovernance/pkg/inventory/client"
+	inventoryClient "github.com/opengovern/opengovernance/services/inventory/client"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 )

diff --git a/pkg/analytics/job.go b/pkg/analytics/job.go
@@ -5,21 +5,22 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"math"
+	"net/http"
+	"reflect"
+	"regexp"
+	"strings"
+	"time"
+
 	authApi "github.com/opengovern/og-util/pkg/api"
 	shared_entities "github.com/opengovern/og-util/pkg/api/shared-entities"
 	esSinkClient "github.com/opengovern/og-util/pkg/es/ingest/client"
 	"github.com/opengovern/og-util/pkg/httpclient"
 	"github.com/opengovern/og-util/pkg/jq"
-	inventoryApi "github.com/opengovern/opengovernance/pkg/inventory/api"
 	"github.com/opengovern/opengovernance/pkg/utils"
 	integrationApi "github.com/opengovern/opengovernance/services/integration/api/models"
 	integrationClient "github.com/opengovern/opengovernance/services/integration/client"
-	"math"
-	"net/http"
-	"reflect"
-	"regexp"
-	"strings"
-	"time"
+	inventoryApi "github.com/opengovern/opengovernance/services/inventory/api"
 
 	"github.com/opengovern/og-util/pkg/es"
 	"github.com/opengovern/og-util/pkg/steampipe"
@@ -30,7 +31,7 @@ import (
 	"github.com/opengovern/opengovernance/pkg/analytics/es/spend"
 	describeApi "github.com/opengovern/opengovernance/pkg/describe/api"
 	describeClient "github.com/opengovern/opengovernance/pkg/describe/client"
-	inventoryClient "github.com/opengovern/opengovernance/pkg/inventory/client"
+	inventoryClient "github.com/opengovern/opengovernance/services/inventory/client"
 	"go.uber.org/zap"
 )
 

diff --git a/pkg/describe/api/jobs.go b/pkg/describe/api/jobs.go
@@ -1,9 +1,10 @@
 package api
 
 import (
-	"github.com/opengovern/opengovernance/pkg/analytics/api"
-	queryrunner "github.com/opengovern/opengovernance/pkg/inventory/query-runner"
 	"time"
+
+	"github.com/opengovern/opengovernance/pkg/analytics/api"
+	queryrunner "github.com/opengovern/opengovernance/services/inventory/query-runner"
 )
 
 type JobType string

diff --git a/pkg/describe/db/compliance_runner.go b/pkg/describe/db/compliance_runner.go
@@ -2,10 +2,11 @@ package db
 
 import (
 	"errors"
-	"github.com/opengovern/opengovernance/pkg/compliance/runner"
+	"time"
+
 	"github.com/opengovern/opengovernance/pkg/describe/db/model"
+	"github.com/opengovern/opengovernance/services/compliance/runner"
 	"gorm.io/gorm"
-	"time"
 )
 
 func (db Database) CreateRunnerJobs(tx *gorm.DB, runners []*model.ComplianceRunner) error {

diff --git a/pkg/describe/db/compliance_summarizer.go b/pkg/describe/db/compliance_summarizer.go
@@ -2,10 +2,11 @@ package db
 
 import (
 	"errors"
-	"github.com/opengovern/opengovernance/pkg/compliance/summarizer"
+	"time"
+
 	"github.com/opengovern/opengovernance/pkg/describe/db/model"
+	"github.com/opengovern/opengovernance/services/compliance/summarizer"
 	"gorm.io/gorm"
-	"time"
 )
 
 func (db Database) CreateSummarizerJob(summarizer *model.ComplianceSummarizer) error {

diff --git a/pkg/describe/db/model/compliance_job.go b/pkg/describe/db/model/compliance_job.go
@@ -3,12 +3,13 @@ package model
 import (
 	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/lib/pq"
-	"github.com/opengovern/opengovernance/pkg/compliance/runner"
-	"github.com/opengovern/opengovernance/pkg/compliance/summarizer"
 	"github.com/opengovern/opengovernance/pkg/describe/api"
+	"github.com/opengovern/opengovernance/services/compliance/runner"
+	"github.com/opengovern/opengovernance/services/compliance/summarizer"
 	"gorm.io/gorm"
-	"time"
 )
 
 type ComplianceJobStatus string

diff --git a/pkg/describe/db/model/query_runner.go b/pkg/describe/db/model/query_runner.go
@@ -1,7 +1,7 @@
 package model
 
 import (
-	queryrunner "github.com/opengovern/opengovernance/pkg/inventory/query-runner"
+	queryrunner "github.com/opengovern/opengovernance/services/inventory/query-runner"
 	"gorm.io/gorm"
 )
 

diff --git a/pkg/describe/db/query_runner.go b/pkg/describe/db/query_runner.go
@@ -3,8 +3,9 @@ package db
 import (
 	"errors"
 	"fmt"
+
 	"github.com/opengovern/opengovernance/pkg/describe/db/model"
-	queryrunner "github.com/opengovern/opengovernance/pkg/inventory/query-runner"
+	queryrunner "github.com/opengovern/opengovernance/services/inventory/query-runner"
 	"gorm.io/gorm"
 )
 

diff --git a/pkg/describe/scheduler.go b/pkg/describe/scheduler.go
@@ -6,16 +6,17 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/opengovern/og-util/pkg/opengovernance-es-sdk"
-	queryrunnerscheduler "github.com/opengovern/opengovernance/pkg/describe/schedulers/query-runner"
-	queryrunner "github.com/opengovern/opengovernance/pkg/inventory/query-runner"
-	integration_type "github.com/opengovern/opengovernance/services/integration/integration-type"
 	"net"
 	"net/http"
 	"strconv"
 	"sync"
 	"time"
 
+	"github.com/opengovern/og-util/pkg/opengovernance-es-sdk"
+	queryrunnerscheduler "github.com/opengovern/opengovernance/pkg/describe/schedulers/query-runner"
+	integration_type "github.com/opengovern/opengovernance/services/integration/integration-type"
+	queryrunner "github.com/opengovern/opengovernance/services/inventory/query-runner"
+
 	envoyAuth "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3"
 	"github.com/nats-io/nats.go/jetstream"
 	authAPI "github.com/opengovern/og-util/pkg/api"
@@ -29,20 +30,20 @@ import (
 	"github.com/opengovern/opengovernance/pkg/analytics"
 	"github.com/opengovern/opengovernance/pkg/checkup"
 	checkupAPI "github.com/opengovern/opengovernance/pkg/checkup/api"
-	"github.com/opengovern/opengovernance/pkg/compliance/client"
-	"github.com/opengovern/opengovernance/pkg/compliance/runner"
-	"github.com/opengovern/opengovernance/pkg/compliance/summarizer"
 	"github.com/opengovern/opengovernance/pkg/describe/api"
 	"github.com/opengovern/opengovernance/pkg/describe/config"
 	"github.com/opengovern/opengovernance/pkg/describe/db"
 	"github.com/opengovern/opengovernance/pkg/describe/db/model"
 	"github.com/opengovern/opengovernance/pkg/describe/schedulers/compliance"
 	"github.com/opengovern/opengovernance/pkg/describe/schedulers/discovery"
-	inventoryClient "github.com/opengovern/opengovernance/pkg/inventory/client"
-	metadataClient "github.com/opengovern/opengovernance/pkg/metadata/client"
-	"github.com/opengovern/opengovernance/pkg/metadata/models"
 	"github.com/opengovern/opengovernance/pkg/utils"
+	"github.com/opengovern/opengovernance/services/compliance/client"
+	"github.com/opengovern/opengovernance/services/compliance/runner"
+	"github.com/opengovern/opengovernance/services/compliance/summarizer"
 	integrationClient "github.com/opengovern/opengovernance/services/integration/client"
+	inventoryClient "github.com/opengovern/opengovernance/services/inventory/client"
+	metadataClient "github.com/opengovern/opengovernance/services/metadata/client"
+	"github.com/opengovern/opengovernance/services/metadata/models"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"go.uber.org/zap"

diff --git a/pkg/describe/scheduler_analytics.go b/pkg/describe/scheduler_analytics.go
@@ -4,17 +4,18 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"time"
+
 	"github.com/opengovern/og-util/pkg/api"
 	"github.com/opengovern/og-util/pkg/httpclient"
 	integrationapi "github.com/opengovern/opengovernance/services/integration/api/models"
-	"time"
 
 	"github.com/nats-io/nats.go/jetstream"
 	"github.com/opengovern/og-util/pkg/ticker"
 	"github.com/opengovern/opengovernance/pkg/analytics"
 	analyticsApi "github.com/opengovern/opengovernance/pkg/analytics/api"
 	"github.com/opengovern/opengovernance/pkg/describe/db/model"
-	inventoryApi "github.com/opengovern/opengovernance/pkg/inventory/api"
+	inventoryApi "github.com/opengovern/opengovernance/services/inventory/api"
 	"go.uber.org/zap"
 	"gorm.io/gorm"
 )