diff --git a/.env.example b/.env.example index e025a0e9..b3f5db80 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.5.9 +OSCTRL_VERSION=0.6.0 OSQUERY_VERSION=5.23.1 NGINX_VERSION=1.31.0-alpine POSTGRES_VERSION=13.5-alpine diff --git a/cmd/api/main.go b/cmd/api/main.go index 8a1f62f8..22c07c05 100644 --- a/cmd/api/main.go +++ b/cmd/api/main.go @@ -1539,7 +1539,7 @@ func initializeLoggers(cfg config.YAMLConfigurationService) { } // @title osctrl API -// @version 0.5.9 +// @version 0.6.0 // @description API service for osctrl, a fast and efficient osquery management solution. // @termsOfService https://github.com/jmpsec/osctrl // @contact.name osctrl diff --git a/frontend/src/features/health/HealthPage.test.tsx b/frontend/src/features/health/HealthPage.test.tsx index 0f91bbe6..952bbbb5 100644 --- a/frontend/src/features/health/HealthPage.test.tsx +++ b/frontend/src/features/health/HealthPage.test.tsx @@ -28,7 +28,7 @@ function makeStatus(overrides: Partial = {}): 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.5.9', up_to_date: true, checked: true, skew: false }, + upgrade: { current: '0.5.8', suggested: '0.5.8', latest: '0.6.0', 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.5.9')).toBeInTheDocument(); + expect(await screen.findByText('0.6.0')).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.5.9', 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.0', 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(); diff --git a/osctrl-api.yaml b/osctrl-api.yaml index 0446f45d..7d12b8a1 100644 --- a/osctrl-api.yaml +++ b/osctrl-api.yaml @@ -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.5.9 + version: 0.6.0 paths: /: get: diff --git a/pkg/health/version_test.go b/pkg/health/version_test.go index 28792218..296e90dc 100644 --- a/pkg/health/version_test.go +++ b/pkg/health/version_test.go @@ -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.5.9", SuggestedRelease: "0.5.8"}) + c.Set(version.VersionData{LatestRelease: "0.6.0", SuggestedRelease: "0.5.8"}) info := c.Info("0.5.8") require.True(t, info.Checked) - require.Equal(t, "0.5.9", info.Latest) + require.Equal(t, "0.6.0", 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.5.9", SuggestedRelease: "0.5.8"}) + c.Set(version.VersionData{LatestRelease: "0.6.0", SuggestedRelease: "0.5.8"}) info := c.Info("0.5.7") require.True(t, info.Skew) require.Equal(t, "0.5.7", info.TLS) diff --git a/pkg/version/version.go b/pkg/version/version.go index 3c3afdbb..ed1f7d80 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -13,7 +13,7 @@ import ( const ( // OsctrlVersion to have the version for all components - OsctrlVersion = "0.5.9" + OsctrlVersion = "0.6.0" // OsqueryVersion to have the version for osquery defined OsqueryVersion = "5.23.1" // VersionDataURL to have the URL to retrieve the latest version for all osctrl components