Skip to content

Commit

Permalink
CBAPI-5318: Update copyright dates in code (#87)
Browse files Browse the repository at this point in the history
* updated copyrights in src tree

* updated copyrights in bin & docker directories

* updated name in license file

* Update Flask

* fixed requirements.txt

* try a tweak to the dockerfile for RHEL

* put that back

* bumped CBC SDK required version

* update required CBC SDK version to 1.5.5

---------

Co-authored-by: Alex Van Brunt <alex.van-brunt@broadcom.com>
  • Loading branch information
abowersox-cb and Alex Van Brunt authored Jul 11, 2024
1 parent f10e183 commit 909f64f
Show file tree
Hide file tree
Showing 28 changed files with 134 additions and 19 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2024 VMware Inc.
Copyright (c) 2020-2024 Broadcom Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
10 changes: 10 additions & 0 deletions bin/linters.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
#!/bin/sh
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.

set -e

Expand Down
10 changes: 10 additions & 0 deletions bin/tests_n_reports.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
#! /bin/bash
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.

set -e

Expand Down
10 changes: 10 additions & 0 deletions docker/amazon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
FROM amazonlinux:latest
LABEL org.opencontainers.image.authors="cb-developer-network@vmware.com"

Expand Down
10 changes: 10 additions & 0 deletions docker/rhel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
FROM registry.access.redhat.com/ubi8/ubi:latest
LABEL org.opencontainers.image.authors="cb-developer-network@vmware.com"

Expand Down
10 changes: 10 additions & 0 deletions docker/suse/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
FROM opensuse/tumbleweed
LABEL org.opencontainers.image.authors="cb-developer-network@vmware.com"

Expand Down
10 changes: 10 additions & 0 deletions docker/ubuntu/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.
FROM ubuntu:20.04
LABEL org.opencontainers.image.authors="cb-developer-network@vmware.com"

Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Package dependencies
carbon-black-cloud-sdk >= 1.5.0
carbon-black-cloud-sdk >= 1.5.5
tomli >= 1.1.0; python_version < '3.11'
Jinja2
psutil

# Dev dependencies
flask
flask >=3.0.3
cryptography
pytest==7.2.1
coverage==6.5.0
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
]

install_requires = [
"carbon-black-cloud-sdk >= 1.5.0",
"carbon-black-cloud-sdk >= 1.5.5",
"Jinja2",
"psutil",
"tomli >= 1.1.0; python_version < '3.11'"
Expand Down
11 changes: 11 additions & 0 deletions src/cbc_syslog/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.

from __future__ import absolute_import

__title__ = 'cbc_syslog'
Expand Down
2 changes: 1 addition & 1 deletion src/cbc_syslog/cli.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/cbc_syslog/core.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
11 changes: 11 additions & 0 deletions src/cbc_syslog/util/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.

from __future__ import absolute_import

from cbc_syslog.util.config import Config
Expand Down
2 changes: 1 addition & 1 deletion src/cbc_syslog/util/carbon_black_cloud.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/cbc_syslog/util/config.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
4 changes: 2 additions & 2 deletions src/cbc_syslog/util/example.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU \"AS IS\" WITHOUT
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
Expand Down
2 changes: 1 addition & 1 deletion src/cbc_syslog/util/output.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/cbc_syslog/util/transform.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
11 changes: 11 additions & 0 deletions src/tests/fixtures/mock_alerts.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.

"""Mock Alerts"""

CB_ANALYTICS_ALERT = {
Expand Down
11 changes: 11 additions & 0 deletions src/tests/fixtures/mock_audit_logs.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.

"""Mock Audit Logs"""
AUDIT_LOGGED_IN = {
"requestUrl": None,
Expand Down
11 changes: 11 additions & 0 deletions src/tests/fixtures/mock_stdin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
# *******************************************************
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
# * DISCLAIMER. THIS PROGRAM IS PROVIDED TO YOU "AS IS" WITHOUT
# * WARRANTIES OR CONDITIONS OF ANY KIND, WHETHER ORAL OR WRITTEN,
# * EXPRESS OR IMPLIED. THE AUTHOR SPECIFICALLY DISCLAIMS ANY IMPLIED
# * WARRANTIES OR CONDITIONS OF MERCHANTABILITY, SATISFACTORY QUALITY,
# * NON-INFRINGEMENT AND FITNESS FOR A PARTICULAR PURPOSE.

"""Mock stdin for setup wizard"""

import pathlib
Expand Down
2 changes: 1 addition & 1 deletion src/tests/unit/test_carbon_black_cloud.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/tests/unit/test_cli.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/tests/unit/test_config.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/tests/unit/test_core.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/tests/unit/test_output.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down
2 changes: 1 addition & 1 deletion src/tests/unit/test_transform.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# *******************************************************
# Copyright (c) VMware, Inc. 2020-2024. All Rights Reserved.
# Copyright (c) Broadcom, Inc. 2020-2024. All Rights Reserved. Carbon Black.
# SPDX-License-Identifier: MIT
# *******************************************************
# *
Expand Down

0 comments on commit 909f64f

Please sign in to comment.