Merge pull request #1114 from jmpsec/prepare-0.6.1

Prepare for release 0.6.1

Author: javuto

.env.example

@@ -1,4 +1,4 @@
-OSCTRL_VERSION=0.6.0
+OSCTRL_VERSION=0.6.1
 OSQUERY_VERSION=5.24.0
 NGINX_VERSION=1.31.0-alpine
 POSTGRES_VERSION=13.5-alpine

cmd/api/main.go

@@ -1664,7 +1664,7 @@ func initializeLoggers(cfg config.YAMLConfigurationService) {
 }
 
 // @title osctrl API
-// @version 0.6.0
+// @version 0.6.1
 // @description API service for osctrl, a fast and efficient osquery management solution.
 // @termsOfService https://github.com/jmpsec/osctrl
 // @contact.name osctrl

frontend/package-lock.json

@@ -28,7 +28,7 @@ function makeStatus(overrides: Partial<HealthStatus> = {}): HealthStatus {
       { id: 'tls', name: 'osctrl-tls', status: 'stale', summary: 'last reported 4m0s ago' },
       { id: 'workers', name: 'Workers', status: 'degraded', summary: 'alerts worker dropped 12 hits' },
     ],
-    upgrade: { current: '0.5.8', suggested: '0.5.8', latest: '0.6.0', up_to_date: true, checked: true, skew: false },
+    upgrade: { current: '0.5.8', suggested: '0.5.8', latest: '0.6.1', up_to_date: true, checked: true, skew: false },
     ...overrides,
   };
 }
@@ -156,13 +156,13 @@ describe('HealthPage', () => {
 
   it('shows upgrade status and hides the skew row when versions agree', async () => {
     renderPage();
-    expect(await screen.findByText('0.6.0')).toBeInTheDocument();
+    expect(await screen.findByText('0.6.1')).toBeInTheDocument();
     expect(screen.queryByText(/version mismatch/i)).not.toBeInTheDocument();
   });
 
   it('calls out version skew between services', async () => {
     mockGetHealth.mockResolvedValue(makeStatus({
-      upgrade: { current: '0.5.8', suggested: '0.5.8', latest: '0.6.0', up_to_date: true, checked: true, skew: true, api_version: '0.5.8', tls_version: '0.5.7' },
+      upgrade: { current: '0.5.8', suggested: '0.5.8', latest: '0.6.1', up_to_date: true, checked: true, skew: true, api_version: '0.5.8', tls_version: '0.5.7' },
     }));
     renderPage();
     expect(await screen.findByText(/version mismatch/i)).toBeInTheDocument();

frontend/src/features/health/HealthPage.test.tsx

@@ -9,7 +9,7 @@ info:
     url: https://github.com/jmpsec/osctrl/blob/master/LICENSE
   termsOfService: https://github.com/jmpsec/osctrl
   title: osctrl API
-  version: 0.6.0
+  version: 0.6.1
 paths:
   /:
     get:

osctrl-api.yaml

@@ -17,17 +17,17 @@ func TestUpgradeInfoBeforeAnyCheck(t *testing.T) {
 
 func TestUpgradeInfoAfterCheck(t *testing.T) {
 	c := NewVersionCache("0.5.8")
-	c.Set(version.VersionData{LatestRelease: "0.6.0", SuggestedRelease: "0.5.8"})
+	c.Set(version.VersionData{LatestRelease: "0.6.1", SuggestedRelease: "0.5.8"})
 	info := c.Info("0.5.8")
 	require.True(t, info.Checked)
-	require.Equal(t, "0.6.0", info.Latest)
+	require.Equal(t, "0.6.1", info.Latest)
 	require.Equal(t, "0.5.8", info.Suggested)
 	require.False(t, info.Skew)
 }
 
 func TestUpgradeInfoReportsServiceSkew(t *testing.T) {
 	c := NewVersionCache("0.5.8")
-	c.Set(version.VersionData{LatestRelease: "0.6.0", SuggestedRelease: "0.5.8"})
+	c.Set(version.VersionData{LatestRelease: "0.6.1", SuggestedRelease: "0.5.8"})
 	info := c.Info("0.5.7")
 	require.True(t, info.Skew)
 	require.Equal(t, "0.5.7", info.TLS)

pkg/health/version_test.go

@@ -13,7 +13,7 @@ import (
 
 const (
 	// OsctrlVersion to have the version for all components
-	OsctrlVersion = "0.6.0"
+	OsctrlVersion = "0.6.1"
 	// OsqueryVersion to have the version for osquery defined
 	OsqueryVersion = "5.24.0"
 	// VersionDataURL to have the URL to retrieve the latest version for all osctrl components