Skip to content

Commit

Permalink
chore: fix lint issues and bump server sdk version (#715)
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Beemer <beeme1mr@users.noreply.github.com>
  • Loading branch information
beeme1mr authored Jan 4, 2024
1 parent f6a39a2 commit bd57177
Show file tree
Hide file tree
Showing 19 changed files with 57 additions and 37 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Thumbs.db

# generated files
proto
.nx

# yalc stuff
.yalc
Expand Down
4 changes: 2 additions & 2 deletions libs/hooks/open-telemetry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"current-version": "echo $npm_package_version"
},
"peerDependencies": {
"@openfeature/server-sdk": "^1.6.0",
"@openfeature/server-sdk": "^1.8.0",
"@opentelemetry/api": ">=1.3.0"
},
"license": "Apache-2.0"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ describe(MetricsHook.name, () => {
} as EvaluationDetails<number>;

// configure a mapper that throws
const attributeMapper: AttributeMapper = (_) => {
const attributeMapper: AttributeMapper = () => {
throw new Error('fake error');
};
const hook = new MetricsHook({ attributeMapper });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ describe('OpenTelemetry Hooks', () => {
describe('error in mapper', () => {
beforeEach(() => {
tracingHook = new TracingHook({
attributeMapper: (_) => {
attributeMapper: () => {
throw new Error('fake error');
},
});
Expand Down
4 changes: 2 additions & 2 deletions libs/providers/config-cat/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"current-version": "echo $npm_package_version"
},
"peerDependencies": {
"@openfeature/server-sdk": "^1.6.0",
"@openfeature/server-sdk": "^1.8.0",
"configcat-js": "^8.0.0"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ describe('ConfigCatProvider', () => {
await provider.initialize();

// Currently there is no option to get access to the event emitter
// eslint-disable-next-line @typescript-eslint/no-explicit-any
configCatEmitter = (provider.configCatClient as any).options.hooks;
});

Expand Down
4 changes: 2 additions & 2 deletions libs/providers/env-var/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"current-version": "echo $npm_package_version"
},
"peerDependencies": {
"@openfeature/server-sdk": "^1.6.0"
"@openfeature/server-sdk": "^1.8.0"
}
}
}
6 changes: 3 additions & 3 deletions libs/providers/flagd/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
"current-version": "echo $npm_package_version"
},
"dependencies": {
"@openfeature/flagd-core": "~0.1.4"
"@openfeature/flagd-core": "~0.1.7"
},
"peerDependencies": {
"@grpc/grpc-js": "~1.8.0 || ~1.9.0",
"@openfeature/server-sdk": ">=1.6.0"
"@openfeature/server-sdk": ">=1.8.0"
}
}
}
22 changes: 15 additions & 7 deletions libs/providers/flagd/src/e2e/setup-in-process-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,25 @@ import { OpenFeature } from '@openfeature/server-sdk';
import { FlagdProvider } from '../lib/flagd-provider';

const FLAGD_NAME = 'flagd Provider';
const E2E_CLIENT_NAME = 'e2e';
const UNSTABLE_CLIENT_NAME = 'unstable';

// register the flagd provider before the tests.
console.log('Setting flagd provider...');
OpenFeature.setProvider(
'e2e',
E2E_CLIENT_NAME,
new FlagdProvider({ cache: 'disabled', resolverType: 'in-process', host: 'localhost', port: 9090 }),
);
OpenFeature.setProvider('unstable', new FlagdProvider({ resolverType: 'in-process', host: 'localhost', port: 9091 }));
// TODO: update with correct assertions once we have ability to get providerMetadata for any provider
// assert(
// OpenFeature.providerMetadata.name === FLAGD_NAME,
// new Error(`Expected ${FLAGD_NAME} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`),
// );
OpenFeature.setProvider(
UNSTABLE_CLIENT_NAME,
new FlagdProvider({ resolverType: 'in-process', host: 'localhost', port: 9091 }),
);
assert(
OpenFeature.getProviderMetadata(E2E_CLIENT_NAME).name === FLAGD_NAME,
new Error(`Expected ${FLAGD_NAME} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`),
);
assert(
OpenFeature.getProviderMetadata(UNSTABLE_CLIENT_NAME).name === FLAGD_NAME,
new Error(`Expected ${FLAGD_NAME} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`),
);
console.log('flagd provider configured!');
19 changes: 12 additions & 7 deletions libs/providers/flagd/src/e2e/setup-rpc-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,19 @@ import { OpenFeature } from '@openfeature/server-sdk';
import { FlagdProvider } from '../lib/flagd-provider';

const FLAGD_NAME = 'flagd Provider';
const E2E_CLIENT_NAME = 'e2e';
const UNSTABLE_CLIENT_NAME = 'unstable';

// register the flagd provider before the tests.
console.log('Setting flagd provider...');
OpenFeature.setProvider('e2e', new FlagdProvider({ cache: 'disabled' }));
OpenFeature.setProvider('unstable', new FlagdProvider({ cache: 'disabled', port: 8014 }));
// TODO: update with correct assertions once we have ability to get providerMetadata for any provider
// assert(
// OpenFeature.providerMetadata.name === FLAGD_NAME,
// new Error(`Expected ${FLAGD_NAME} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`),
// );
OpenFeature.setProvider(E2E_CLIENT_NAME, new FlagdProvider({ cache: 'disabled' }));
OpenFeature.setProvider(UNSTABLE_CLIENT_NAME, new FlagdProvider({ cache: 'disabled', port: 8014 }));
assert(
OpenFeature.getProviderMetadata(E2E_CLIENT_NAME).name === FLAGD_NAME,
new Error(`Expected ${FLAGD_NAME} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`),
);
assert(
OpenFeature.getProviderMetadata(UNSTABLE_CLIENT_NAME).name === FLAGD_NAME,
new Error(`Expected ${FLAGD_NAME} provider to be configured, instead got: ${OpenFeature.providerMetadata.name}`),
);
console.log('flagd provider configured!');
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ defineFeature(feature, (test) => {
then('the PROVIDER_CONFIGURATION_CHANGED handler must run', () => {
expect(ran).toBeTruthy();
});
and(/^the event details must indicate "(.*)" was altered$/, (arg0) => {
and(/^the event details must indicate "(.*)" was altered$/, () => {
// not supported
});
});
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/flagd/src/lib/configuration.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { FlagdProviderOptions, getConfig } from './configuration';
import { DEFAULT_MAX_CACHE_SIZE, DEFAULT_MAX_EVENT_STREAM_RETRIES } from './constants';
import { DEFAULT_MAX_CACHE_SIZE } from './constants';

describe('Configuration', () => {
const OLD_ENV = process.env;
Expand Down
2 changes: 1 addition & 1 deletion libs/providers/flagd/src/lib/configuration.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { DEFAULT_MAX_CACHE_SIZE, DEFAULT_MAX_EVENT_STREAM_RETRIES } from './constants';
import { DEFAULT_MAX_CACHE_SIZE } from './constants';

export type CacheOption = 'lru' | 'disabled';
export type ResolverType = 'rpc' | 'in-process';
Expand Down
1 change: 1 addition & 0 deletions libs/providers/go-feature-flag-web/src/lib/model.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { FlagValue, ErrorCode, EvaluationContextValue } from '@openfeature/web-sdk';

/**
Expand Down
4 changes: 2 additions & 2 deletions libs/providers/go-feature-flag/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"current-version": "echo $npm_package_version"
},
"peerDependencies": {
"@openfeature/server-sdk": "^1.6.0"
"@openfeature/server-sdk": "^1.8.0"
}
}
}
4 changes: 2 additions & 2 deletions libs/providers/go-feature-flag/src/lib/data-collector-hook.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class GoFeatureFlagDataCollectorHook implements Hook {
}
}

after(hookContext: HookContext, evaluationDetails: EvaluationDetails<FlagValue>, hookHints?: HookHints) {
after(hookContext: HookContext, evaluationDetails: EvaluationDetails<FlagValue>) {
if (!this.collectUnCachedEvaluation && evaluationDetails.reason !== StandardResolutionReasons.CACHED) {
return;
}
Expand All @@ -109,7 +109,7 @@ export class GoFeatureFlagDataCollectorHook implements Hook {
this.dataCollectorBuffer?.push(event);
}

error(hookContext: HookContext, err: unknown, hookHints?: HookHints) {
error(hookContext: HookContext) {
const event = {
contextKind: hookContext.context['anonymous'] ? 'anonymousUser' : 'user',
kind: 'feature',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
//Copyright 2022 Catamorphic, Co.
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
11 changes: 7 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"@nx/workspace": "16.9.1",
"@openfeature/core": "^0.0.21",
"@openfeature/flagd-core": ">=0.1.1",
"@openfeature/server-sdk": "^1.6.2",
"@openfeature/server-sdk": "^1.8.0",
"@openfeature/web-sdk": "^0.4.0",
"@opentelemetry/sdk-metrics": "^1.15.0",
"@swc-node/register": "~1.6.0",
Expand Down

0 comments on commit bd57177

Please sign in to comment.