Skip to content

Remove dead code and add job in CI to find it #2882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 15, 2023
Merged

Remove dead code and add job in CI to find it #2882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
620ca07
Remove dead code
reivaj05 Jun 14, 2023
bb3abf9
Run prettify
reivaj05 Jun 14, 2023
173c575
Merge branch 'master' into remove-dead-code
reivaj05 Jun 14, 2023
128d28a
Merge branch 'master' into remove-dead-code
bexsoft Jun 14, 2023
c817edf
Merge branch 'master' into remove-dead-code
bexsoft Jun 15, 2023
33424d4
Merge branch 'master' into remove-dead-code
bexsoft Jun 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/workflows/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,11 @@ jobs:
continue-on-error: false
run: |
./check-prettier.sh
- name: Check for dead code
working-directory: ./portal-ui
continue-on-error: false
run: |
./check-deadcode.sh
reuse-golang-dependencies:
name: reuse golang dependencies
runs-on: ubuntu-latest
Expand Down
8 changes: 8 additions & 0 deletions portal-ui/check-deadcode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

if [ -f "$NVM_DIR/nvm.sh" ]
then
\. "$NVM_DIR/nvm.sh";
nvm use;
fi
yarn find-deadcode
4 changes: 3 additions & 1 deletion portal-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
"buildistanbulcoverage": "PORT=9090 USE_BABEL_PLUGIN_ISTANBUL=1 react-app-rewired build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"playwright": "PORT=5005 USE_BABEL_PLUGIN_ISTANBUL=1 react-app-rewired start"
"playwright": "PORT=5005 USE_BABEL_PLUGIN_ISTANBUL=1 react-app-rewired start",
"find-deadcode": "ts-prune -s consoleApi.ts | (! grep -v 'used in module')"
},
"eslintConfig": {
"extends": "react-app",
Expand Down Expand Up @@ -93,6 +94,7 @@
"react-app-rewired": "^2.2.1",
"react-scripts": "5.0.1",
"testcafe": "^2.6.2",
"ts-prune": "^0.10.3",
"typescript": "^4.4.3"
},
"resolutions": {
Expand Down
209 changes: 0 additions & 209 deletions portal-ui/src/common/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export const units = [
];
export const k8sUnits = ["Ki", "Mi", "Gi", "Ti", "Pi", "Ei"];
export const k8sCalcUnits = ["B", ...k8sUnits];
export const timeUnits = ["ms", "s", "m", "h", "d", "w", "M", "Q", "y"];

export const niceBytes = (x: string, showK8sUnits: boolean = false) => {
let n = parseInt(x, 10) || 0;
Expand All @@ -54,18 +53,6 @@ export const niceBytesInt = (n: number, showK8sUnits: boolean = false) => {
return n.toFixed(1) + " " + (showK8sUnits ? k8sUnitsN[l] : units[l]);
};

export const setCookie = (name: string, val: string) => {
const date = new Date();
const value = val;

// Set it expire in 45 minutes
date.setTime(date.getTime() + 45 * 60 * 1000);

// Set it
document.cookie =
name + "=" + value + "; expires=" + date.toUTCString() + "; path=/";
};

export const deleteCookie = (name: string) => {
document.cookie = name + "=; expires=Thu, 01 Jan 1970 00:00:01 GMT;";
};
Expand All @@ -86,13 +73,6 @@ export const timeFromDate = (d: Date) => {
return `${h}:${m}:${s}:${d.getMilliseconds()}`;
};

// units to be used in a dropdown
export const factorForDropdown = () => {
return units.map((unit) => {
return { label: unit, value: unit };
});
};

// units to be used in a dropdown
export const k8sScalarUnitsExcluding = (exclude?: string[]) => {
return k8sUnits
Expand Down Expand Up @@ -137,12 +117,6 @@ export const getBytesNumber = (
return total;
};

//getTotalSize gets the total size of a value & unit
export const getTotalSize = (value: string, unit: string) => {
const bytes = getBytes(value, unit, true).toString();
return niceBytes(bytes);
};

export const setMemoryResource = (
memorySize: number,
capacitySize: string,
Expand Down Expand Up @@ -518,189 +492,6 @@ export const getClientOS = (): string => {
return getPlatform;
};

export const MinIOEnvVarsSettings: any = {
MINIO_ACCESS_KEY: { secret: true },
MINIO_ACCESS_KEY_OLD: { secret: true },
MINIO_AUDIT_WEBHOOK_AUTH_TOKEN: { secret: true },
MINIO_IDENTITY_LDAP_LOOKUP_BIND_PASSWORD: { secret: true },
MINIO_IDENTITY_OPENID_CLIENT_SECRET: { secret: true },
MINIO_KMS_SECRET_KEY: { secret: true },
MINIO_LOGGER_WEBHOOK_AUTH_TOKEN: { secret: true },
MINIO_NOTIFY_ELASTICSEARCH_PASSWORD: { secret: true },
MINIO_NOTIFY_KAFKA_SASL_PASSWORD: { secret: true },
MINIO_NOTIFY_MQTT_PASSWORD: { secret: true },
MINIO_NOTIFY_NATS_PASSWORD: { secret: true },
MINIO_NOTIFY_NATS_TOKEN: { secret: true },
MINIO_NOTIFY_REDIS_PASSWORD: { secret: true },
MINIO_NOTIFY_WEBHOOK_AUTH_TOKEN: { secret: true },
MINIO_ROOT_PASSWORD: { secret: true },
MINIO_SECRET_KEY: { secret: true },
MINIO_SECRET_KEY_OLD: { secret: true },
};

export const MinIOEnvironmentVariables = [
"MINIO_ACCESS_KEY",
"MINIO_ACCESS_KEY_OLD",
"MINIO_AUDIT_WEBHOOK_AUTH_TOKEN",
"MINIO_AUDIT_WEBHOOK_CLIENT_CERT",
"MINIO_AUDIT_WEBHOOK_CLIENT_KEY",
"MINIO_AUDIT_WEBHOOK_ENABLE",
"MINIO_AUDIT_WEBHOOK_ENDPOINT",
"MINIO_BROWSER",
"MINIO_BROWSER_REDIRECT_URL",
"MINIO_IDENTITY_LDAP_COMMENT",
"MINIO_IDENTITY_LDAP_GROUP_SEARCH_BASE_DN",
"MINIO_IDENTITY_LDAP_GROUP_SEARCH_FILTER",
"MINIO_IDENTITY_LDAP_LOOKUP_BIND_DN",
"MINIO_IDENTITY_LDAP_LOOKUP_BIND_PASSWORD",
"MINIO_IDENTITY_LDAP_SERVER_ADDR",
"MINIO_IDENTITY_LDAP_SERVER_INSECURE",
"MINIO_IDENTITY_LDAP_SERVER_STARTTLS",
"MINIO_IDENTITY_LDAP_STS_EXPIRY",
"MINIO_IDENTITY_LDAP_TLS_SKIP_VERIFY",
"MINIO_IDENTITY_LDAP_USER_DN_SEARCH_BASE_DN",
"MINIO_IDENTITY_LDAP_USER_DN_SEARCH_FILTER",
"MINIO_IDENTITY_LDAP_USERNAME_FORMAT",
"MINIO_IDENTITY_OPENID_CLAIM_NAME",
"MINIO_IDENTITY_OPENID_CLAIM_PREFIX",
"MINIO_IDENTITY_OPENID_CLIENT_ID",
"MINIO_IDENTITY_OPENID_CLIENT_SECRET",
"MINIO_IDENTITY_OPENID_COMMENT",
"MINIO_IDENTITY_OPENID_CONFIG_URL",
"MINIO_IDENTITY_OPENID_REDIRECT_URI",
"MINIO_IDENTITY_OPENID_SCOPES",
"MINIO_KMS_AUTO_ENCRYPTION",
"MINIO_KMS_KES_CERT_FILE",
"MINIO_KMS_KES_ENDPOINT",
"MINIO_KMS_KES_KEY_FILE",
"MINIO_KMS_KES_KEY_NAME",
"MINIO_KMS_SECRET_KEY",
"MINIO_LOGGER_WEBHOOK_AUTH_TOKEN",
"MINIO_LOGGER_WEBHOOK_ENABLE",
"MINIO_LOGGER_WEBHOOK_ENDPOINT",
"MINIO_LOG_QUERY_URL",
"MINIO_NOTIFY_AMQP_AUTO_DELETED",
"MINIO_NOTIFY_AMQP_COMMENT",
"MINIO_NOTIFY_AMQP_DELIVERY_MODE",
"MINIO_NOTIFY_AMQP_DURABLE",
"MINIO_NOTIFY_AMQP_ENABLE",
"MINIO_NOTIFY_AMQP_EXCHANGE",
"MINIO_NOTIFY_AMQP_EXCHANGE_TYPE",
"MINIO_NOTIFY_AMQP_INTERNAL",
"MINIO_NOTIFY_AMQP_MANDATORY",
"MINIO_NOTIFY_AMQP_NO_WAIT",
"MINIO_NOTIFY_AMQP_QUEUE_DIR",
"MINIO_NOTIFY_AMQP_QUEUE_LIMIT",
"MINIO_NOTIFY_AMQP_ROUTING_KEY",
"MINIO_NOTIFY_AMQP_URL",
"MINIO_NOTIFY_ELASTICSEARCH_COMMENT",
"MINIO_NOTIFY_ELASTICSEARCH_ENABLE",
"MINIO_NOTIFY_ELASTICSEARCH_FORMAT",
"MINIO_NOTIFY_ELASTICSEARCH_INDEX",
"MINIO_NOTIFY_ELASTICSEARCH_PASSWORD",
"MINIO_NOTIFY_ELASTICSEARCH_QUEUE_DIR",
"MINIO_NOTIFY_ELASTICSEARCH_QUEUE_LIMIT",
"MINIO_NOTIFY_ELASTICSEARCH_URL",
"MINIO_NOTIFY_ELASTICSEARCH_USERNAME",
"MINIO_NOTIFY_KAFKA_BROKERS",
"MINIO_NOTIFY_KAFKA_CLIENT_TLS_CERT",
"MINIO_NOTIFY_KAFKA_CLIENT_TLS_KEY",
"MINIO_NOTIFY_KAFKA_COMMENT",
"MINIO_NOTIFY_KAFKA_ENABLE",
"MINIO_NOTIFY_KAFKA_QUEUE_DIR",
"MINIO_NOTIFY_KAFKA_QUEUE_LIMIT",
"MINIO_NOTIFY_KAFKA_SASL",
"MINIO_NOTIFY_KAFKA_SASL_MECHANISM",
"MINIO_NOTIFY_KAFKA_SASL_PASSWORD",
"MINIO_NOTIFY_KAFKA_SASL_USERNAME",
"MINIO_NOTIFY_KAFKA_TLS",
"MINIO_NOTIFY_KAFKA_TLS_CLIENT_AUTH",
"MINIO_NOTIFY_KAFKA_TLS_SKIP_VERIFY",
"MINIO_NOTIFY_KAFKA_TOPIC",
"MINIO_NOTIFY_KAFKA_VERSION",
"MINIO_NOTIFY_MQTT_BROKER",
"MINIO_NOTIFY_MQTT_COMMENT",
"MINIO_NOTIFY_MQTT_ENABLE",
"MINIO_NOTIFY_MQTT_KEEP_ALIVE_INTERVAL",
"MINIO_NOTIFY_MQTT_PASSWORD",
"MINIO_NOTIFY_MQTT_QOS",
"MINIO_NOTIFY_MQTT_QUEUE_DIR",
"MINIO_NOTIFY_MQTT_QUEUE_LIMIT",
"MINIO_NOTIFY_MQTT_RECONNECT_INTERVAL",
"MINIO_NOTIFY_MQTT_TOPIC",
"MINIO_NOTIFY_MQTT_USERNAME",
"MINIO_NOTIFY_MYSQL_COMMENT",
"MINIO_NOTIFY_MYSQL_DSN_STRING",
"MINIO_NOTIFY_MYSQL_ENABLE",
"MINIO_NOTIFY_MYSQL_FORMAT",
"MINIO_NOTIFY_MYSQL_MAX_OPEN_CONNECTIONS",
"MINIO_NOTIFY_MYSQL_QUEUE_DIR",
"MINIO_NOTIFY_MYSQL_QUEUE_LIMIT",
"MINIO_NOTIFY_MYSQL_TABLE",
"MINIO_NOTIFY_NATS_ADDRESS",
"MINIO_NOTIFY_NATS_CERT_AUTHORITY",
"MINIO_NOTIFY_NATS_CLIENT_CERT",
"MINIO_NOTIFY_NATS_CLIENT_KEY",
"MINIO_NOTIFY_NATS_COMMENT",
"MINIO_NOTIFY_NATS_ENABLE",
"MINIO_NOTIFY_NATS_PASSWORD",
"MINIO_NOTIFY_NATS_PING_INTERVAL",
"MINIO_NOTIFY_NATS_QUEUE_DIR",
"MINIO_NOTIFY_NATS_QUEUE_LIMIT",
"MINIO_NOTIFY_NATS_STREAMING",
"MINIO_NOTIFY_NATS_STREAMING_ASYNC",
"MINIO_NOTIFY_NATS_STREAMING_CLUSTER_ID",
"MINIO_NOTIFY_NATS_STREAMING_MAX_PUB_ACKS_IN_FLIGHT",
"MINIO_NOTIFY_NATS_SUBJECT",
"MINIO_NOTIFY_NATS_TLS",
"MINIO_NOTIFY_NATS_TLS_SKIP_VERIFY",
"MINIO_NOTIFY_NATS_TOKEN",
"MINIO_NOTIFY_NATS_USERNAME",
"MINIO_NOTIFY_NSQ_COMMENT",
"MINIO_NOTIFY_NSQ_ENABLE",
"MINIO_NOTIFY_NSQ_NSQD_ADDRESS",
"MINIO_NOTIFY_NSQ_QUEUE_DIR",
"MINIO_NOTIFY_NSQ_QUEUE_LIMIT",
"MINIO_NOTIFY_NSQ_TLS",
"MINIO_NOTIFY_NSQ_TLS_SKIP_VERIFY",
"MINIO_NOTIFY_NSQ_TOPIC",
"MINIO_NOTIFY_POSTGRESQL_COMMENT",
"MINIO_NOTIFY_POSTGRESQL_CONNECTION_STRING",
"MINIO_NOTIFY_POSTGRESQL_ENABLE",
"MINIO_NOTIFY_POSTGRESQL_FORMAT",
"MINIO_NOTIFY_POSTGRESQL_MAX_OPEN_CONNECTIONS",
"MINIO_NOTIFY_POSTGRESQL_QUEUE_DIR",
"MINIO_NOTIFY_POSTGRESQL_QUEUE_LIMIT",
"MINIO_NOTIFY_POSTGRESQL_TABLE",
"MINIO_NOTIFY_REDIS_ADDRESS",
"MINIO_NOTIFY_REDIS_COMMENT",
"MINIO_NOTIFY_REDIS_ENABLE",
"MINIO_NOTIFY_REDIS_FORMAT",
"MINIO_NOTIFY_REDIS_KEY",
"MINIO_NOTIFY_REDIS_PASSWORD",
"MINIO_NOTIFY_REDIS_QUEUE_DIR",
"MINIO_NOTIFY_REDIS_QUEUE_LIMIT",
"MINIO_NOTIFY_WEBHOOK_AUTH_TOKEN",
"MINIO_NOTIFY_WEBHOOK_CLIENT_CERT",
"MINIO_NOTIFY_WEBHOOK_CLIENT_KEY",
"MINIO_NOTIFY_WEBHOOK_COMMENT",
"MINIO_NOTIFY_WEBHOOK_ENABLE",
"MINIO_NOTIFY_WEBHOOK_ENDPOINT",
"MINIO_NOTIFY_WEBHOOK_QUEUE_DIR",
"MINIO_NOTIFY_WEBHOOK_QUEUE_LIMIT",
"MINIO_PROMETHEUS_AUTH_TYPE",
"MINIO_PROMETHEUS_JOB_ID",
"MINIO_PROMETHEUS_URL",
"MINIO_ROOT_PASSWORD",
"MINIO_ROOT_USER",
"MINIO_SECRET_KEY",
"MINIO_SECRET_KEY_OLD",
"MINIO_SERVER_URL",
"MINIO_STORAGE_CLASS_COMMENT",
"MINIO_STORAGE_CLASS_RRS",
"MINIO_STORAGE_CLASS_STANDARD",
];

// Generates a valid access/secret key string
export const getRandomString = function (length = 16): string {
let retval = "";
Expand Down
83 changes: 0 additions & 83 deletions portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ObjectActionButton.tsx
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/types.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@ export interface BucketObjectItem {
is_latest?: boolean;
}

export interface BucketObjectItemsList {
objects: BucketObjectItem[];
total?: number;
}

export interface WebsocketRequest {
mode: "objects" | "rewind" | "close" | "cancel";
bucket_name?: string;
Expand Down
6 changes: 0 additions & 6 deletions portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ export interface IFileInfo {
is_delete_marker?: boolean;
user_metadata?: object;
}

export interface FileInfoResponse {
objects: IFileInfo[];
total: number;
}

export interface MetadataResponse {
objectMetadata: object;
}
Loading