Skip to content

Commit b552cbe

Browse files
feat(*): Synchronize content with OpenCTI 6.2.1
1 parent 97f84f3 commit b552cbe

File tree

6 files changed

+29
-9
lines changed

6 files changed

+29
-9
lines changed

.github/workflows/doc-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ jobs:
3636
gem install awesome_bot
3737
cd extension
3838
awesome_bot --files README.md --allow-dupe --allow-redirect --allow 401 --skip-save-results --base-url http://localhost:8080/
39-
awesome_bot docs/*.md --allow-dupe --allow-redirect --allow 401 --white-list http://opencti --skip-save-results --base-url http://localhost:8080/docs/
39+
awesome_bot docs/*.md --allow-dupe --allow-redirect --allow 401 --white-list http://opencti,https://github.com/OpenCTI-Platform/connectors/releases/tag/A.B.C --skip-save-results --base-url http://localhost:8080/docs/

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ functions provided by the `src` folder and the following files: `docker-compose.
1010

1111
---
1212

13+
## [1.2.0](https://github.com/crowdsecurity/cs-opencti-internal-enrichment-connector/releases/tag/v1.2.0) - 2024-07-05
14+
[_Compare with previous release_](https://github.com/crowdsecurity/cs-opencti-internal-enrichment-connector/compare/v1.1.0...v1.2.0)
15+
16+
### Changed
17+
18+
- Synchronize content with OpenCTI connector's release [6.2.1](https://github.com/OpenCTI-Platform/connectors/releases/tag/6.2.1)
19+
20+
---
21+
1322
## [1.1.0](https://github.com/crowdsecurity/cs-opencti-internal-enrichment-connector/releases/tag/v1.1.0) - 2024-06-27
1423
[_Compare with previous release_](https://github.com/crowdsecurity/cs-opencti-internal-enrichment-connector/compare/v1.0.0...v1.1.0)
1524

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3'
22
services:
33
connector-crowdsec:
4-
image: opencti/connector-crowdsec:6.0.9
4+
image: opencti/connector-crowdsec:6.2.1
55
environment:
66
- OPENCTI_URL=http://opencti:8080 # OpenCTI API URL
77
- OPENCTI_TOKEN=ChangeMe # Add OpenCTI API token here

docs/DEVELOPER.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ connector-crowdsec:
270270
Push your modification
271271
272272
```shell
273-
git push origin git push origin feat/release-1.1.0
273+
git push origin git push origin feat/release-X.Y.Z
274274
```
275275

276276
Now you can use the `feat/release-X.Y.Z` branch to open a pull request in the OpenCTI repository.
@@ -280,8 +280,9 @@ For the pull request description, you could use the release version description
280280

281281
### During the pull request review
282282

283-
As long as the pull request is in review state, we should not create a new release. If there are modifications to do, we can do it directly on the `feat/release-1.1.0`. If possible, all changes made to pass the pull request review should be back ported to a `feat/pr-review-X-Y-Z` branch created in this repository:
284-
283+
As long as the pull request is in review state, we should not create a new release.
284+
If there are modifications to do, we can do it directly on the `feat/release-X.Y.Z`.
285+
All changes made to pass the pull request review must be back ported to a `feat/pr-review-X-Y-Z` branch created in this repository:
285286

286287
```shell
287288
cd cs-opencti-internal-enrichment-connector
@@ -290,10 +291,10 @@ git checkout -b feat/pr-review-X.Y.Z
290291
```
291292

292293

293-
294294
### Once pull request is merged
295295

296-
Once the connectors repository has merged our updates, we need to sync the merged `internal-enrichment/crowdsec` sources with this repo.
296+
Once the connectors repository has merged our updates, and once OpenCTI has published a new release of connectors with the updates,
297+
we need to sync the merged `internal-enrichment/crowdsec` sources with this repo.
297298

298299
#### Sync fork with upstream
299300

@@ -321,6 +322,16 @@ cp -r ../connectors/internal-enrichment/crowdsec/. ./
321322
Add and commit the result. Push the `feat/pr-review-X-Y-Z` and merge it into `main` with a pull request.
322323

323324

325+
#### Create a new minor release
326+
327+
Once the `main` branch is updated, you can create a new minor `X.Y+1.0` release with the following CHANGELOG content:
328+
329+
```
330+
## Changed
331+
332+
- Synchronize content with OpenCTI connector's release [A.B.C](https://github.com/OpenCTI-Platform/connectors/releases/tag/A.B.C)
333+
334+
```
324335

325336

326337

src/crowdsec/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_crowdsec_cti_for_ip(self, ip):
2828
urljoin(self.url, f"smoke/{ip}"),
2929
headers={
3030
"x-api-key": self.api_key,
31-
"User-Agent": "crowdsec-opencti/v1.1.0",
31+
"User-Agent": "crowdsec-opencti/v1.2.0",
3232
},
3333
)
3434
if resp.status_code == 404:

src/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
pycti==6.0.9
1+
pycti==6.2.1
22
pycountry

0 commit comments

Comments
 (0)