Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pete/provider-metadata
Browse files Browse the repository at this point in the history
Signed-off-by: Pete Hodgson <[email protected]>
  • Loading branch information
moredip committed Jan 16, 2023
2 parents b825631 + e42dafc commit 05852eb
Show file tree
Hide file tree
Showing 7 changed files with 50 additions and 67 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/pr-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4

- name: Generate JSON files
run: make parse
Expand All @@ -35,7 +35,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4

- name: Lint
run: make lint
Expand All @@ -45,7 +45,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
- uses: actions/setup-python@v4
- uses: actions/setup-node@v3
with:
node-version: "18"
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ parse: _check_python
lint: node_modules
@python ./tools/specification_parser/lint_json_output.py specification.json
./node_modules/.bin/markdownlint --ignore node_modules/ --ignore tools/ **/*.md
./node_modules/.bin/markdown-link-check -c .markdown-link-check-config.json README.md specification/*.md
./node_modules/.bin/markdown-link-check -c .markdown-link-check-config.json README.md specification/*.md specification/**/*.md

fix: node_modules
prettier -w **/*.md
Expand Down
101 changes: 42 additions & 59 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 @@ -4,7 +4,7 @@
"devDependencies": {
"markdown-link-check": "^3.10.2",
"markdown-toc": "^1.2.0",
"markdownlint-cli": "^0.32.0",
"markdownlint-cli": "^0.33.0",
"prettier": "^2.6.2"
}
}
2 changes: 1 addition & 1 deletion specification/glossary.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ A source-of-truth for flag values and rules. Flag management systems may include

### Provider

An SDK-compliant implementation which resolves flag values from a particular flag management system, allowing the use of the [Evaluation API](./sections/01-flag-evaluation.md#flag-evaluation) as an abstraction for the system in question.
An SDK-compliant implementation which resolves flag values from a particular flag management system, allowing the use of the [Evaluation API](./sections/01-flag-evaluation.md#13-flag-evaluation) as an abstraction for the system in question.

### Integration

Expand Down
2 changes: 1 addition & 1 deletion specification/sections/02-providers.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ provider.getMetadata().getName(); // "my-custom-provider"
resolveBooleanValue(flagKey, defaultValue, context);
```

see: [flag resolution structure](../types.md#resolution-details), [flag value resolution](../glossary.md#flag-value-resolution)
see: [flag resolution structure](../types.md#resolution-details), [flag value resolution](../glossary.md#resolving-flag-values)

##### Condition 2.2.2

Expand Down
2 changes: 1 addition & 1 deletion specification/types.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ A language primitive for representing a date and time, optionally including time

### Evaluation Details

A structure representing the result of the [flag evaluation process](./glossary.md#evaluating-flag-values), and made available in the [detailed flag resolution functions](./sections/01-flag-evaluation.md#detailed-flag-evaluation), containing the following fields:
A structure representing the result of the [flag evaluation process](./glossary.md#evaluating-flag-values), and made available in the [detailed flag resolution functions](./sections/01-flag-evaluation.md#14-detailed-flag-evaluation), containing the following fields:

- flag key (string, required)
- value (boolean | string | number | structure, required)
Expand Down

0 comments on commit 05852eb

Please sign in to comment.