Merge pull request #511 from Hyperkid123/pr-check

Update PR check go image.

.github/workflows/main.yaml

@@ -5,6 +5,9 @@ on:
   push:
     branches:
       - main
+  pull_request: 
+    branches:
+      - main
 
 jobs:
   pr_check:
@@ -52,14 +55,15 @@ jobs:
             INIT_CLIENT_API_TOKENS: "default:development.unleash-insecure-api-token"
             # This is set up to seed in feature flags, production is entirely different
             INIT_ADMIN_API_TOKENS: "*:*.unleash-insecure-api-token"
+            AUTH_TYPE: "none"
 
     steps:
       - uses: actions/checkout@v3
 
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.18'
+          go-version: '1.20'
 
       - name: 'Create env test file'
         run: |

.gitignore

@@ -29,3 +29,4 @@ deploy/debug.yml
 # Temp cache file for service.json generator
 static/**/links-storage.json
 static/**/services-generated.json
+*-services.db

config/config.go

@@ -224,7 +224,6 @@ func init() {
 	if options.DashboardConfig.TemplatesWD == "" {
 		options.DashboardConfig.TemplatesWD = "/"
 	}
-	fmt.Println("DashboardConfig.TemplatesWD: ", options.DashboardConfig.TemplatesWD)
 
 	config = options
 }

local/full-stack-compose.yaml

@@ -61,6 +61,8 @@ services:
       INIT_CLIENT_API_TOKENS: "default:development.unleash-insecure-api-token"
       # This is setup to seed in feature flags, production is entirely different
       INIT_ADMIN_API_TOKENS: "*:*.unleash-insecure-api-token"
+      # Do not require auth for the in local development
+      AUTH_TYPE: "none"
     depends_on:
       db:
         condition: service_healthy

rest/featureflags/featureflags_test.go

@@ -1,9 +1,10 @@
 package featureflags
 
 import (
-	"github.com/RedHatInsights/chrome-service-backend/rest/util"
 	"testing"
 
+	"github.com/RedHatInsights/chrome-service-backend/rest/util"
+
 	"github.com/RedHatInsights/chrome-service-backend/config"
 	"github.com/stretchr/testify/assert"
 )

rest/models/DashboardTemplate.go

@@ -66,7 +66,7 @@ func (aw AvailableWidgets) IsValid() error {
 		return nil
 	}
 
-	return fmt.Errorf("invalid widget. Expected one of [%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s] got %s", FavoriteServices, NotificationsEvents, LearningResources, ExploreCapabilities, Edge, Ansible, Rhel, OpenShift, Quay, Acs, Subscriptions, OpenShiftAi, RecentlyVisited, SupportCases, aw)
+	return fmt.Errorf("invalid widget. Expected one of [%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s] got %s", FavoriteServices, NotificationsEvents, LearningResources, ExploreCapabilities, Edge, Ansible, Rhel, OpenShift, Quay, Acs, Subscriptions, OpenShiftAi, RecentlyVisited, SupportCases, aw)
 }
 
 type BaseWidgetDimensions struct {
@@ -318,7 +318,7 @@ func (wi WidgetIcons) IsValid() error {
 		return nil
 	}
 
-	return fmt.Errorf("invalid widget icon. Expected one of %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s got %s", BellIcon, HistoryIcon, OutlinedBookmarkIcon, RocketIcon, StarIcon, CreditCardIcon, RhelIcon, OpenShiftIcon, EdgeIcon, AnsibleIcon, QuayIcon, ACSIcon, OpenShiftAiIcon, HeadsetIcon, wi)
+	return fmt.Errorf("invalid widget icon. Expected one of %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s got %s", BellIcon, HistoryIcon, OutlinedBookmarkIcon, RocketIcon, StarIcon, CreditCardIcon, RhelIcon, OpenShiftIcon, EdgeIcon, AnsibleIcon, QuayIcon, ACSIcon, OpenShiftAiIcon, HeadsetIcon, wi)
 }
 
 type WidgetHeaderLink struct {

rest/models/DashboardTemplate_test.go

@@ -14,7 +14,7 @@ const (
 	invalidEncodedTemplate = "eyJjcmVhdGVkQXQiOiIwMDAxLTAxLTAxVDAwOjAwOjAwWiIsInVwZGF0ZWRBdCI6IjAwMDEtMDEtMDFUMDA6MDA6MDBaIiwiZGVsZXRlZEF0IjpudWxsLCJ1c2VySWRlbnRpdHlJRCI6MCwiZGVmYXVsdCI6ZmFsc2UsIlRlbXBsYXRlQmFzZSI6eyJuYW1lIjoiIiwiZGlzcGxheU5hbWUiOiJ0ZXN0In0sInRlbXBsYXRlQ29uZmlnIjp7InNtIjpbeyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MSIsIngiOjAsInkiOjAsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MiIsIngiOjAsInkiOjEsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MyIsIngiOjAsInkiOjIsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6Ik1lZGl1bVdpZGdldCNtdzEiLCJ4IjoxLCJ5IjoyLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJTbWFsbFdpZGdldCNzdzEiLCJ4IjoxLCJ5IjowLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJTbWFsbFdpZGdldCNzdzIiLCJ4IjoxLCJ5IjoxLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9XSwibWQiOlt7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTGFyZ2VXaWRnZXQjbHcxIiwieCI6MCwieSI6MCwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTGFyZ2VXaWRnZXQjbHcyIiwieCI6MCwieSI6MSwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTGFyZ2VXaWRnZXQjbHczIiwieCI6MCwieSI6MiwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTWVkaXVtV2lkZ2V0I213MSIsIngiOjIsInkiOjIsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IlNtYWxsV2lkZ2V0I3N3MSIsIngiOjIsInkiOjAsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IlNtYWxsV2lkZ2V0I3N3MiIsIngiOjIsInkiOjEsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX1dLCJsZyI6W3sidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzEiLCJ4IjowLCJ5IjowLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzIiLCJ4IjowLCJ5IjoxLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzMiLCJ4IjowLCJ5IjoyLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJNZWRpdW1XaWRnZXQjbXcxIiwieCI6MywieSI6MiwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiU21hbGxXaWRnZXQjc3cxIiwieCI6MywieSI6MCwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiU21hbGxXaWRnZXQjc3cyIiwieCI6MywieSI6MSwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfV0sInhsIjpbeyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MSIsIngiOjAsInkiOjAsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MiIsIngiOjAsInkiOjEsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MyIsIngiOjAsInkiOjIsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6Ik1lZGl1bVdpZGdldCNtdzEiLCJ4Ijo0LCJ5IjoyLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJTbWFsbFdpZGdldCNzdzEiLCJ4Ijo0LCJ5IjowLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJTbWFsbFdpZGdldCNzdzIiLCJ4Ijo0LCJ5IjoxLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9XX19Cg=="
 	invalidEncodedStruct   = "ewogICAgImZvbyI6ICJiYXIiCn0="
 	invalidEncodedJson     = "ewogICAgImZvbyI6ICJiYXIKfQ=="
-	matchTestString        = "eyJjcmVhdGVkQXQiOiIwMDAxLTAxLTAxVDAwOjAwOjAwWiIsInVwZGF0ZWRBdCI6IjAwMDEtMDEtMDFUMDA6MDA6MDBaIiwiZGVsZXRlZEF0IjpudWxsLCJ1c2VySWRlbnRpdHlJRCI6MCwiZGVmYXVsdCI6ZmFsc2UsIlRlbXBsYXRlQmFzZSI6eyJuYW1lIjoidGVzdCIsImRpc3BsYXlOYW1lIjoidGVzdCJ9LCJ0ZW1wbGF0ZUNvbmZpZyI6eyJzbSI6W3sidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzEiLCJ4IjowLCJ5IjowLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzIiLCJ4IjowLCJ5IjoxLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzMiLCJ4IjowLCJ5IjoyLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJNZWRpdW1XaWRnZXQjbXcxIiwieCI6MSwieSI6MiwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiU21hbGxXaWRnZXQjc3cxIiwieCI6MSwieSI6MCwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiU21hbGxXaWRnZXQjc3cyIiwieCI6MSwieSI6MSwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfV0sIm1kIjpbeyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MSIsIngiOjAsInkiOjAsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MiIsIngiOjAsInkiOjEsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IkxhcmdlV2lkZ2V0I2x3MyIsIngiOjAsInkiOjIsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6Ik1lZGl1bVdpZGdldCNtdzEiLCJ4IjoyLCJ5IjoyLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJTbWFsbFdpZGdldCNzdzEiLCJ4IjoyLCJ5IjowLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJTbWFsbFdpZGdldCNzdzIiLCJ4IjoyLCJ5IjoxLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9XSwibGciOlt7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTGFyZ2VXaWRnZXQjbHcxIiwieCI6MCwieSI6MCwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTGFyZ2VXaWRnZXQjbHcyIiwieCI6MCwieSI6MSwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTGFyZ2VXaWRnZXQjbHczIiwieCI6MCwieSI6MiwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiTWVkaXVtV2lkZ2V0I213MSIsIngiOjMsInkiOjIsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IlNtYWxsV2lkZ2V0I3N3MSIsIngiOjMsInkiOjAsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX0seyJ0aXRsZSI6IldpZGdldCAxIiwiaSI6IlNtYWxsV2lkZ2V0I3N3MiIsIngiOjMsInkiOjEsInciOjEsImgiOjEsIm1heEgiOjQsIm1pbkgiOjEsInN0YXRpYyI6dHJ1ZX1dLCJ4bCI6W3sidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzEiLCJ4IjowLCJ5IjowLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzIiLCJ4IjowLCJ5IjoxLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJMYXJnZVdpZGdldCNsdzMiLCJ4IjowLCJ5IjoyLCJ3IjoxLCJoIjoxLCJtYXhIIjo0LCJtaW5IIjoxLCJzdGF0aWMiOnRydWV9LHsidGl0bGUiOiJXaWRnZXQgMSIsImkiOiJNZWRpdW1XaWRnZXQjbXcxIiwieCI6NCwieSI6MiwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiU21hbGxXaWRnZXQjc3cxIiwieCI6NCwieSI6MCwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfSx7InRpdGxlIjoiV2lkZ2V0IDEiLCJpIjoiU21hbGxXaWRnZXQjc3cyIiwieCI6NCwieSI6MSwidyI6MSwiaCI6MSwibWF4SCI6NCwibWluSCI6MSwic3RhdGljIjp0cnVlfV19fQo="
+	matchTestString        = "eyJjcmVhdGVkQXQiOiIwMDAxLTAxLTAxVDAwOjAwOjAwWiIsInVwZGF0ZWRBdCI6IjAwMDEtMDEtMDFUMDA6MDA6MDBaIiwiZGVsZXRlZEF0IjpudWxsLCJ1c2VySWRlbnRpdHlJRCI6MCwiZGVmYXVsdCI6ZmFsc2UsIlRlbXBsYXRlQmFzZSI6eyJuYW1lIjoidGVzdCIsImRpc3BsYXlOYW1lIjoidGVzdCJ9LCJ0ZW1wbGF0ZUNvbmZpZyI6eyJzbSI6bnVsbCwibWQiOm51bGwsImxnIjpudWxsLCJ4bCI6bnVsbH19Cg=="
 )
 
 var invalidBaseNameTemplate = models.DashboardTemplate{
@@ -45,7 +45,22 @@ var validTemplate = models.DashboardTemplate{
 
 func TestDashboardTemplateValidation(t *testing.T) {
 	itct := service.BaseTemplates["landingPage"].TemplateConfig
-	itct.Sm = service.ConvertToJson(itct.Sm.Data())
+	invalidData := []models.GridItem{
+		{
+			BaseWidgetDimensions: models.BaseWidgetDimensions{
+				Width:     1,
+				Height:    1,
+				MaxHeight: 1,
+				MinHeight: 1,
+			},
+			Title: "Widget 1",
+			ID:    "LargeWidget_lw1",
+			X:     2,
+			Y:     0,
+		},
+	}
+	invalidData[0].X = 2
+	itct.Sm = service.ConvertToJson(invalidData)
 	invalidTemplateConfigTemplate := models.DashboardTemplate{
 		Default: false,
 		TemplateBase: models.DashboardTemplateBase{
@@ -76,7 +91,7 @@ func TestDashboardTemplateValidation(t *testing.T) {
 		{
 			Name:         "invalidTemplateConfigTemplate",
 			Input:        invalidTemplateConfigTemplate,
-			ErrorMessage: "invalid grid item, layout variant sm, coordinate X must be less than or equal to 1",
+			ErrorMessage: "invalid grid item, layout variant sm, coordinate X must be less than 1, current value is 2",
 		}, {
 			Name:         "validTemplate",
 			Input:        validTemplate,
@@ -91,7 +106,6 @@ func TestDashboardTemplateValidation(t *testing.T) {
 			assert.Nil(t, err)
 			continue
 		}
-
 		assert.NotNil(t, err)
 		assert.Equal(t, c.ErrorMessage, err.Error())
 	}